From 774d429ae11503e33ffe9caf0646546a768e6d64 Mon Sep 17 00:00:00 2001 From: cyteen Date: Thu, 13 Jan 2022 21:31:17 +0000 Subject: [PATCH] commit before push. --- 001_apt_get-selections.sh | 3 +- 010_apt-get.sh | 3 + 010_saltstack.sh | 2 +- 020_amprolla.sh | 2 +- 020_arduino.sh | 24 +++--- 020_blender.sh | 2 +- 020_bluez-alsa_dhmake.sh | 12 +-- 020_broot.sh | 4 +- 020_build-farm_client-docker.sh | 2 +- 020_cfmesh-cfdof.sh | 12 +-- 020_conky.sh | 6 +- 020_console.sh | 2 +- 020_devuan_arm-sdk.sh | 2 +- 020_docker-buildx.sh | 6 +- 020_docker-compose_checkinstall.sh | 2 +- 020_docker.sh | 48 ++++++++---- 020_drush.phar.sh | 2 +- 020_elmerfem.sh | 8 +- 020_esy.sh | 4 +- 020_etcher.sh | 2 +- 020_etckeeper.sh | 2 +- 020_fbterm.sh | 2 +- 020_fmui.sh | 4 +- 020_fonts.sh | 4 +- 020_fossamail.sh | 2 +- 020_freecad.sh | 10 +-- 020_freerouting.sh | 4 +- 020_git-lfs.sh | 2 +- 020_grc.sh | 4 +- 020_jq.sh | 8 +- 020_keepass.sh | 2 +- 020_kicad.sh | 6 +- 020_kxstudio.sh | 2 +- 020_larynx-git.sh | 5 +- 020_lsd.sh | 2 +- 020_lxd.sh | 2 +- 020_mutt-wizard.sh | 4 +- 020_nanorc.sh | 2 +- 020_neovim-coc.sh | 22 +++--- 020_neovim-nightly.sh | 6 +- 020_neovim.sh | 4 +- 020_onivim.sh | 2 +- 020_onivim2.sh | 2 +- 020_palemoon.sh | 2 +- 020_platformio-core.sh | 4 +- 020_platformio-core_checkinstall.sh | 2 +- 020_podman.sh | 8 +- 020_pyload.sh | 2 +- 020_python-jf.sh | 2 +- 020_rancher-k3d.sh | 2 +- 020_rox-filer.sh | 5 +- 020_sanoid.sh | 4 +- 020_themes.sh | 10 ++- 020_tldr.sh | 2 +- 020_tmux.sh | 106 +++++++++++++++++++++++++-- 020_ubuntu-kernels.sh | 4 +- 020_unetbootin.sh | 2 +- 020_vcsh.sh | 2 +- 020_vim.sh | 19 ++--- 020_vosk.sh | 2 +- 020_vscode.sh | 4 +- 020_waterfox.sh | 2 +- 020_youtube-dl.sh | 2 +- 020_yq.sh | 6 +- 020_zfs-auto-snapshot.sh | 2 +- 020_zfs-sanoid.sh | 2 +- 020_zfs-znapzend.sh | 6 +- 020_zfs-znapzend_checkinstall.sh | 2 +- 020_zsh.sh | 2 +- 020_zsh_quickstart.sh | 6 +- 020_zsh_zgenom.sh | 4 +- 025_xfce4-theme-fix.sh | 2 +- broot-install.txt | 2 +- build_deb_from_git.sh | 12 +-- compare_docker_selections.sh | 13 ++++ docker_daemon-writer.sh | 2 +- get-gitlab_runner.sh | 34 +++++++++ git-kicad.sh | 2 +- onivim2.sh | 6 +- redis_THP_latancy.txt | 27 +++++++ stylus_global-dark-theme_colours.txt | 10 +++ 81 files changed, 392 insertions(+), 185 deletions(-) create mode 100644 compare_docker_selections.sh create mode 100644 get-gitlab_runner.sh create mode 100644 redis_THP_latancy.txt create mode 100644 stylus_global-dark-theme_colours.txt diff --git a/001_apt_get-selections.sh b/001_apt_get-selections.sh index 122262f..e96f6c5 100755 --- a/001_apt_get-selections.sh +++ b/001_apt_get-selections.sh @@ -2,6 +2,7 @@ # copy a get-selections from the livecd (install your prefered programs beforehand) ## Backup: dpkg --get-selections > /var/tmp/packages.list +debconf-get-selections > /var/tmp/debconf-settings.list /usr/bin/apt-mark showauto > /var/tmp/pkgs_auto.lst /usr/bin/apt-mark showmanual > /var/tmp/pkgs_manual.lst - + diff --git a/010_apt-get.sh b/010_apt-get.sh index f0538ba..344e65f 100755 --- a/010_apt-get.sh +++ b/010_apt-get.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash apt install -y software-properties-common apt-transport-https wget curl lvm2 apt install -y apt-file +apt install -y debconf-utils apt install -y tree apt install -y tmux apt install -y xclip @@ -15,6 +16,8 @@ apt install -y pastebinit apt install -y gnutls-bin apt install -y tig apt install -y grc +apt install -y mtr +apt install -y ntpdate apt install -y gawk apt install -y gitk apt install -y zsync diff --git a/010_saltstack.sh b/010_saltstack.sh index 8a1ac4b..51ea873 100755 --- a/010_saltstack.sh +++ b/010_saltstack.sh @@ -119,7 +119,7 @@ apt install -yq -o -o "DPkg::Options::=--force-confold" --no-install-recommends # curl -L https://bootstrap.saltstack.com | sh -s -- -X git develop # salt-common in debian is missing zsh completions -# source: https://github.com/saltstack/salt/tree/develop/pkg/ *.{bash,zsh} +# source: http://github.com/saltstack/salt/tree/develop/pkg/ *.{bash,zsh} # FYI: completition provided by salt-common pkg test -e /usr/share/bash-completion/completions/salt-common || \ diff --git a/020_amprolla.sh b/020_amprolla.sh index c6b262b..e1185da 100755 --- a/020_amprolla.sh +++ b/020_amprolla.sh @@ -66,7 +66,7 @@ apt install -y gnupg2 python3-requests rsync cd /usr/src/ -git clone https://github.com/parazyd/amprolla +git clone http://github.com/parazyd/amprolla cd /usr/src/amprolla cp lib/config.def.py lib/config.py diff --git a/020_arduino.sh b/020_arduino.sh index 3c21ce1..74b9e2b 100755 --- a/020_arduino.sh +++ b/020_arduino.sh @@ -22,13 +22,13 @@ apt install -y git python3-serial #https://raw.githubusercontent.com/espressif/arduino-esp32/master/package/package_esp32_index.template.json #http://arduino.esp8266.com/stable/package_esp8266com_index.json -#https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json +#http://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json #https://sandeepmistry.github.io/arduino-nRF5/package_nRF5_boards_index.json #https://micooke.github.io/package_nRF5_smartwatches_index.json -# https://github.com/arduino/Arduino/wiki/Unofficial-list-of-3rd-party-boards-support-urls +# http://github.com/arduino/Arduino/wiki/Unofficial-list-of-3rd-party-boards-support-urls # Install ESP32 core -# See: https://github.com/espressif/arduino-esp32/blob/master/docs/arduino-ide/boards_manager.md +# See: http://github.com/espressif/arduino-esp32/blob/master/docs/arduino-ide/boards_manager.md ADD_URLS="${ADD_URLS},https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" #ADD_URLS="${ADD_URLS}, https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json" ${ARDUINO_DIR}/arduino \ @@ -40,7 +40,7 @@ ${ARDUINO_DIR}/arduino --install-boards esp32:esp32 ## ESP32-core from git 369MB Choose this or the above otherwise you will get two menus #mkdir -p ${ARDUINO_DIR}/hardware/espressif && \ # cd ${ARDUINO_DIR}/hardware/espressif && \ -# git clone https://github.com/espressif/arduino-esp32.git esp32 && \ +# git clone http://github.com/espressif/arduino-esp32.git esp32 && \ # cd esp32 && \ # git submodule update --init --recursive && \ # cd tools/ && \ @@ -62,7 +62,7 @@ ${ARDUINO_DIR}/arduino --install-boards esp8266:esp8266 # http://docs.leaflabs.com/static.leaflabs.com/pub/leaflabs/maple-docs/latest/arduino-compatibility.html # --pref boardsmanager.additional.urls="http://dan.drown.org/stm32duino/package_STM32duino_index.json" \ #${ARDUINO_DIR}/arduino --install-boards stm32duino:STM32F1 -ADD_URLS="${ADD_URLS},https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json" +ADD_URLS="${ADD_URLS},http://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json" echo ${ADD_URLS} ${ARDUINO_DIR}/arduino \ --pref boardsmanager.additional.urls=${ADD_URLS} \ @@ -72,7 +72,7 @@ ${ARDUINO_DIR}/arduino \ ${ARDUINO_DIR}/arduino --install-boards STM32:stm32 -# Install NRF5x sandeepmistry https://github.com/sandeepmistry/arduino-nRF5 +# Install NRF5x sandeepmistry http://github.com/sandeepmistry/arduino-nRF5 #name "BBC micro:bit" #name "Bluz DK" #name "Generic nRF51822" @@ -98,10 +98,10 @@ ${ARDUINO_DIR}/arduino \ ${ARDUINO_DIR}/arduino --install-boards sandeepmistry:nRF5 NRF_HOME=${ARDUINO_TOOLS_DIR}/nRF5FlashSoftDevice/tool/ -mkdir -p "${NRF_HOME}" && wget -c --directory-prefix "${NRF_HOME}" https://github.com/sandeepmistry/arduino-nRF5/releases/download/tools/nRF5FlashSoftDevice.jar +mkdir -p "${NRF_HOME}" && wget -c --directory-prefix "${NRF_HOME}" http://github.com/sandeepmistry/arduino-nRF5/releases/download/tools/nRF5FlashSoftDevice.jar -# nRF5 watches https://github.com/micooke/arduino-nRF5-smartwatches +# nRF5 watches http://github.com/micooke/arduino-nRF5-smartwatches # Smartwatch variants for sandeepmistry's Nordic Semiconductor nRF5 core #name "IDO003" #name "ID100HR" @@ -134,14 +134,14 @@ ${ARDUINO_DIR}/arduino --install-boards micooke:nRF5 #sudo ln -sf /lib/x86_64-linux-gnu/libudev.so.1 /lib/x86_64-linux-gnu/libudev.so.0 # Guru meditation decode - get a more meaningful explanation of the stack traces you get on ESP8266/ESP32. -wget -qO - https://github.com/me-no-dev/EspExceptionDecoder/releases/download/1.1.0/EspExceptionDecoder-1.1.0.zip | bsdtar -C "${ARDUINO_TOOLS_DIR}" -xvf- +wget -qO - http://github.com/me-no-dev/EspExceptionDecoder/releases/download/1.1.0/EspExceptionDecoder-1.1.0.zip | bsdtar -C "${ARDUINO_TOOLS_DIR}" -xvf- # Other libraries direct from github -git clone https://github.com/adafruit/Touch-Screen-Library ~/Arduino/libraries/TouchScreen +git clone http://github.com/adafruit/Touch-Screen-Library ~/Arduino/libraries/TouchScreen # https://learn.adafruit.com/ahrs-for-adafruits-9-dof-10-dof-breakout/sensor-fusion-algorithmsahrs -git clone https://github.com/PaulStoffregen/MahonyAHRS ~/Arduino/libraries/MahonyAHRS -git clone https://github.com/PaulStoffregen/MadgwickAHRS ~/Arduino/libraries/MadgwickAHRS +git clone http://github.com/PaulStoffregen/MahonyAHRS ~/Arduino/libraries/MahonyAHRS +git clone http://github.com/PaulStoffregen/MadgwickAHRS ~/Arduino/libraries/MadgwickAHRS diff --git a/020_blender.sh b/020_blender.sh index 3d4eb40..e376844 100755 --- a/020_blender.sh +++ b/020_blender.sh @@ -6,7 +6,7 @@ sudo apt install -y blender # Topology optimization with ToOptix # /usr/share/blender/scripts in in blender-data -git clone https://github.com/DMST1990/ToOptiX /tmp/ToOptix +git clone http://github.com/DMST1990/ToOptiX /tmp/ToOptix sudo cp -a /tmp/ToOptix/ToOptix/BlenderGUI/ToOptix /usr/share/blender/scripts/addons diff --git a/020_bluez-alsa_dhmake.sh b/020_bluez-alsa_dhmake.sh index b758be5..e82edac 100755 --- a/020_bluez-alsa_dhmake.sh +++ b/020_bluez-alsa_dhmake.sh @@ -50,7 +50,7 @@ sed -i 's,^\(DiscoverableTimeout = \).*,\1'\"0\"',' /etc/bluetooth/main.conf mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -101,7 +101,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b @@ -176,7 +176,7 @@ EOF # autostart bluealsa #cat < /etc/rc.local -## Start bluealsa as root +## Start bluealsa as root #export LIBASOUND_THREAD_SAFE=0 #/usr/bin/bluealsa -S & #EOF @@ -231,9 +231,9 @@ gawk -i inplace ' ## ## AOSP libldac dispatcher ## https://android.googlesource.com/platform/external/libldac -## https://github.com/EHfive/ldacBT +## http://github.com/EHfive/ldacBT -#git clone https://github.com/EHfive/ldacBT.git +#git clone http://github.com/EHfive/ldacBT.git #cd ldacBT #git submodule update --init # @@ -247,6 +247,6 @@ gawk -i inplace ' #------------------------------------------------------------------------ ## [open]aptx - reverse-engineered apt-X -## https://github.com/Arkq/openaptx +## http://github.com/Arkq/openaptx #------------------------------------------------------------------------ diff --git a/020_broot.sh b/020_broot.sh index 8e7eb55..f3256e5 100755 --- a/020_broot.sh +++ b/020_broot.sh @@ -23,7 +23,7 @@ LONG_DESCRIPTION=" Get an overview of a directory, even a big one" mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -72,7 +72,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_build-farm_client-docker.sh b/020_build-farm_client-docker.sh index 8c0a7bb..2ff96bc 100644 --- a/020_build-farm_client-docker.sh +++ b/020_build-farm_client-docker.sh @@ -1,4 +1,4 @@ -# https://github.com/elijahr/build-farm +# http://github.com/elijahr/build-farm # By default, the client containers will assume that a compiler image is # running in the same docker network. The compiler address is configured diff --git a/020_cfmesh-cfdof.sh b/020_cfmesh-cfdof.sh index b619e11..5bb2873 100755 --- a/020_cfmesh-cfdof.sh +++ b/020_cfmesh-cfdof.sh @@ -27,7 +27,7 @@ LONG_DESCRIPTION=" A fork of the cfMesh project ported to the latest OpenFOAM ve mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -#git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +#git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} git clone https://git.code.sf.net/p/cfmesh-cfdof/cfmesh cfmesh-cfdof-${NOW} @@ -80,7 +80,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b @@ -109,7 +109,7 @@ export LIBASOUND_THREAD_SAFE=0 # autostart bluealsa #cat < /etc/rc.local -## Start bluealsa as root +## Start bluealsa as root #export LIBASOUND_THREAD_SAFE=0 #/usr/bin/bluealsa -S & #EOF @@ -155,9 +155,9 @@ export LIBASOUND_THREAD_SAFE=0 ## ## AOSP libldac dispatcher ## https://android.googlesource.com/platform/external/libldac -## https://github.com/EHfive/ldacBT +## http://github.com/EHfive/ldacBT -#git clone https://github.com/EHfive/ldacBT.git +#git clone http://github.com/EHfive/ldacBT.git #cd ldacBT #git submodule update --init # @@ -171,6 +171,6 @@ export LIBASOUND_THREAD_SAFE=0 #------------------------------------------------------------------------ ## [open]aptx - reverse-engineered apt-X -## https://github.com/Arkq/openaptx +## http://github.com/Arkq/openaptx #------------------------------------------------------------------------ diff --git a/020_conky.sh b/020_conky.sh index ff08662..913e379 100755 --- a/020_conky.sh +++ b/020_conky.sh @@ -13,8 +13,8 @@ echo "Hidden folder conky is created if it is not there" wget -qO- -O /var/tmp/aurora.tar.gz http://downloads.sourceforge.net/project/auroraconkytheme/Aurora_v3.0.4.tar.gz && tar xzf /var/tmp/aurora.tar.gz && mv Aurora/ ${DEST}/.conky && rm /var/tmp/aurora.tar.gz #cd /tmp -#git clone https://github.com/maxiwell/conky-seamod -#git clone https://github.com/zagortenay333/Harmattan +#git clone http://github.com/maxiwell/conky-seamod +#git clone http://github.com/zagortenay333/Harmattan apt install -y lm-sensors hddtemp dmidecode @@ -40,7 +40,7 @@ cp ./fonts/* ${DEST}/.conky/fonts # ## build deps #apt install -y autotools-dev devscripts debhelper valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev -#git clone https://github.com/zcot/conky-manager2 +#git clone http://github.com/zcot/conky-manager2 #cd conky-manager2 # ## Adjust to accept current valac version diff --git a/020_console.sh b/020_console.sh index b711b6f..0914804 100755 --- a/020_console.sh +++ b/020_console.sh @@ -19,7 +19,7 @@ apt install -y console-setup #sed -i 's,^\(VIDEOMODE=\).*,\1'\"\"',' /etc/default/console-setup # Powerline - ter-powerline-v16b.psf.gz -wget -c --directory-prefix /usr/share/fonts/PSF https://github.com/powerline/fonts/raw/master/Terminus/PSF/ter-powerline-v16b.psf.gz +wget -c --directory-prefix /usr/share/fonts/PSF http://github.com/powerline/fonts/raw/master/Terminus/PSF/ter-powerline-v16b.psf.gz sed -i 's,^\(ACTIVE_CONSOLES=\).*,\1'\"/dev/tty\[1-6\]\"',' /etc/default/console-setup sed -i 's,^\(CHARMAP=\).*,\1'\"UTF-8\"',' /etc/default/console-setup sed -i 's,^\(CODESET=\).*,\1'\"guess\"',' /etc/default/console-setup diff --git a/020_devuan_arm-sdk.sh b/020_devuan_arm-sdk.sh index 6c310e6..03b10ae 100755 --- a/020_devuan_arm-sdk.sh +++ b/020_devuan_arm-sdk.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash cd /space/code_repositories/ mkdir devuan_arm-sdk && cd devuan_arm-sdk -git clone https://github.com/parazyd/arm-sdk +git clone http://github.com/parazyd/arm-sdk apt install -y curl git wget qemu-user-static build-essential rsync gcc-arm-none-eabi gcc-multilib lib32z1 u-boot-tools device-tree-compiler lzop dosfstools vboot-utils vboot-kernel-utils libftdi-dev libfdt-dev swig libpython-dev bc diff --git a/020_docker-buildx.sh b/020_docker-buildx.sh index 2f4c8dd..a671f0a 100644 --- a/020_docker-buildx.sh +++ b/020_docker-buildx.sh @@ -74,7 +74,7 @@ TL;DR WIP: High-level build constructs (bake) In-container driver support (both Docker and Kubernetes) -see: https://github.com/docker/buildx +see: http://github.com/docker/buildx EOF cat > ${BUILD_DIR}/checkinstall_it.sh << FOE @@ -121,8 +121,8 @@ set -e DEST_DIR=/root/.docker/cli-plugins #mkdir -p ${DEST_DIR} mkdir -p /root/.docker/cli-plugins -#wget -O ${DEST_DIR}/docker-buildx https://github.com/docker/${PROJECT}/releases/download/${VERSION}/buildx-${VERSION}.linux-${ARCH} -wget -O /root/.docker/cli-plugins/docker-buildx https://github.com/docker/${PROJECT}/releases/download/${VERSION}/buildx-${VERSION}.linux-${ARCH} +#wget -O ${DEST_DIR}/docker-buildx http://github.com/docker/${PROJECT}/releases/download/${VERSION}/buildx-${VERSION}.linux-${ARCH} +wget -O /root/.docker/cli-plugins/docker-buildx http://github.com/docker/${PROJECT}/releases/download/${VERSION}/buildx-${VERSION}.linux-${ARCH} FOE bash ${BUILD_DIR}/checkinstall_it.sh diff --git a/020_docker-compose_checkinstall.sh b/020_docker-compose_checkinstall.sh index 3e6f49b..31f462e 100755 --- a/020_docker-compose_checkinstall.sh +++ b/020_docker-compose_checkinstall.sh @@ -107,7 +107,7 @@ cat > ${BUILD_DIR}/install.sh << FOE set -e #set -x -wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/${VERSION}/${PACKAGE}-`uname -s`-`uname -m` && chmod +x /usr/local/bin/${PACKAGE} +wget -O /usr/local/bin/docker-compose http://github.com/docker/compose/releases/download/${VERSION}/${PACKAGE}-`uname -s`-`uname -m` && chmod +x /usr/local/bin/${PACKAGE} FOE diff --git a/020_docker.sh b/020_docker.sh index c231aec..aae3d9a 100755 --- a/020_docker.sh +++ b/020_docker.sh @@ -64,7 +64,7 @@ bash -c " sed -i '/^DOCKER_BUILDKIT.*/ s/^/#/' /etc/default/docker" # The above can also be passed in /etc/docker/daemon.json # For other options: -# https://github.com/moby/moby/pull/23657/files?short_path=ca4f406 +# http://github.com/moby/moby/pull/23657/files?short_path=ca4f406 # https://gist.github.com/lvdh/1f2d50ad49274413d3e501b71a59e819 mkdir -p /etc/docker if [ ! -f /etc/docker/daemon.json ] @@ -75,10 +75,6 @@ else echo "/etc/docker/daemon.json exists." fi -# https://docs.docker.com/engine/security/https/ -# FIXME: Should be on the same dataset as the docker rpool (/var/lib/docker) -TLS_HOME=/var/docker - ## Default configuration file on linux: ## /etc/docker/daemon.json # FIXME: remove the options in /etc/default/docker and use /etc/docker/daemon.json instead. @@ -110,12 +106,6 @@ DOCKER_OPT[6]='.["features"] = {"buildkit": true}' #DOCKER_OPT[7]='.["hosts"] = ["fd://","unix:///var/run/docker.sock","tcp://0.0.0.0:2376"]' #DOCKER_OPT[8]='.["experimental"] = true' -mkdir -p ${TLS_HOME} -## Change the subj line to reflect you details for key generation and uncomment above to turn tls on. -#openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 \ -# -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" \ -# -keyout ${TLS_HOME}/serverkey.pem \ -# -out ${TLS_HOME}/server.pem for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do @@ -144,11 +134,41 @@ done # mv -b /tmp/daemon.json.new /etc/docker/daemon.json #done +# https://docs.docker.com/engine/security/protect-access/ +# Use TLS (HTTPS) to protect the Docker daemon socket rather than ssh. +# FIXME: Should be on the same dataset as the docker rpool (/var/lib/docker) +TLS_HOME="/var/lib/docker/certs.d" +KEYNAME="server" +TLSHOSTS="tcp://192.168.59.3:2376" + +mkdir -p ${TLS_HOME} +#{ +# "debug": true, +# "tls": true, +# "tlscert": "/var/docker/server.pem", +# "tlskey": "/var/docker/serverkey.pem", +# "hosts": ["tcp://192.168.59.3:2376"] +#} +#DOCKER_OPT[9]='.["tls"] = true' +#DOCKER_OPT[10]=".["tlscert"] = "${TLS_HOME}/${KEYNAME}.pem"" +#DOCKER_OPT[11]=".["tlskey"] = "${TLS_HOME}/${KEYNAME}key.pem"" +#DOCKER_OPT[12]=".["hosts"] = ["${TLSHOSTS}"]" + +# Replace all instances of $HOST in the following with the DNS name of your +# Docker daemon’s host. + +## Change the subj line to reflect your details for key generation and uncomment +## above to turn tls on. +#openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 \ +# -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=${HOST}" \ +# -keyout ${TLS_HOME}/${KEYNAME}_key.pem \ +# -out ${TLS_HOME}/${KEYNAME}.pem + # Add tls - we keep the keys on the docker zfs dataset not /etc/docker/tls #DOCKER_OPT[0]='.["tls"] = ["true"]' -#DOCKER_OPT[1]='.["tlscacert"] = ["/var/lib/docker/ca.pem"]' -#DOCKER_OPT[2]='.["tlscert"] = ["/var/lib/docker/server.pem"]' -#DOCKER_OPT[3]='.["tlskey"] = ["/var/lib/docker/serverkey.pem"]' +#DOCKER_OPT[1]='.["tlscacert"] = ["${TLS_HOME}/ca.pem"]' +#DOCKER_OPT[2]='.["tlscert"] = ["${TLS_HOME}/${KEYNAME}.pem"]' +#DOCKER_OPT[3]='.["tlskey"] = ["${TLS_HOME}/${KEYNAME}_key.pem"]' #DOCKER_OPT[4]='.["tlsverify"] = ["true"]' #DOCKER_OPT[5]='.["hosts"] = ["tcp://192.168.59.3:2376"]' diff --git a/020_drush.phar.sh b/020_drush.phar.sh index 2dcde5c..4ee11fd 100755 --- a/020_drush.phar.sh +++ b/020_drush.phar.sh @@ -5,6 +5,6 @@ RELEASE=$(curl "https://api.github.com/repos/${PROJECT}/releases?per_page=5" | j VERSION=$(echo "${RELEASE}" | cut -c 2- | cut -f1 -d"-") DOWNLOAD_DIR=/tmp -wget -c --directory-prefix "${DOWNLOAD_DIR}" https://github.com/${PROJECT}/releases/download/"${RELEASE}"/drush.phar +wget -c --directory-prefix "${DOWNLOAD_DIR}" http://github.com/${PROJECT}/releases/download/"${RELEASE}"/drush.phar chmod +x drush.phar && \ mv drush.phar /usr/local/bin/drush diff --git a/020_elmerfem.sh b/020_elmerfem.sh index 3606eaf..7309f3d 100755 --- a/020_elmerfem.sh +++ b/020_elmerfem.sh @@ -34,7 +34,7 @@ LONG_DESCRIPTION=" The Elmer open source mutiphysics simulation package includes mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone -b ${BRANCH} https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${RELEASE} +git clone -b ${BRANCH} http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${RELEASE} cd ${PACKAGE}-${RELEASE} || exit @@ -160,9 +160,9 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz - https://github.com/ElmerCSC/elmerfem/tags - https://github.com/ElmerCSC/elmerfem/archive/scc20.tar.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/ElmerCSC/elmerfem/tags + http://github.com/ElmerCSC/elmerfem/archive/scc20.tar.gz EOF sudo mk-build-deps --install debian/control diff --git a/020_esy.sh b/020_esy.sh index 064bf7f..f0e22ab 100755 --- a/020_esy.sh +++ b/020_esy.sh @@ -24,7 +24,7 @@ LONG_DESCRIPTION=" esy is a rapid workflow for developing Reason/OCaml projects. mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -75,7 +75,7 @@ echo **************** cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_etcher.sh b/020_etcher.sh index 12af8f4..8254c9e 100755 --- a/020_etcher.sh +++ b/020_etcher.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# https://github.com/balena-io/etcher +# http://github.com/balena-io/etcher AVAILABLE=/etc/apt/sources.list-available ACTIVE=/etc/apt/sources.list.d diff --git a/020_etckeeper.sh b/020_etckeeper.sh index f1bf42c..412438e 100755 --- a/020_etckeeper.sh +++ b/020_etckeeper.sh @@ -3,7 +3,7 @@ apt install -y etckeeper git openssh-client # use the GitLab API to create a project -# https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/projects.md#create-project +# http://github.com/gitlabhq/gitlabhq/blob/master/doc/api/projects.md#create-project # POST /projects diff --git a/020_fbterm.sh b/020_fbterm.sh index 2e6c2c3..b2977b0 100644 --- a/020_fbterm.sh +++ b/020_fbterm.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash DEST=${1:-/etc/skel} -= https://github.com/zhangyuanwei/fbterm += http://github.com/zhangyuanwei/fbterm sudo apt-get install -y fbterm diff --git a/020_fmui.sh b/020_fmui.sh index e7ef8fd..b9a4de3 100755 --- a/020_fmui.sh +++ b/020_fmui.sh @@ -5,7 +5,7 @@ apt install -y toilet fzf mpc vis ffmpeg # pip3 install --user fmui -git clone https://github.com/seebye/fmui /usr/local +git clone http://github.com/seebye/fmui /usr/local PROJECT=seebye/fmui PRERELEASE=false @@ -72,7 +72,7 @@ BASE_REPO='fmui' # RELEASES_URL="${BASE_URL}/${BASE_USER}/${BASE_REPO}"/releases # CONTENT=$(curl -s ${RELEASES_URL}/latest) # LATEST_URL=$(echo "${CONTENT}" | jq --raw-output '.assets[] | select(.browser_download_url | test("Linux-x86_64")) | .browser_download_url') -LATEST_URL=https://github.com/seebye/fmui +LATEST_URL=http://github.com/seebye/fmui # Download and copy the latest version to /usr/local/bin and make executable git clone ${LATEST_URL} /var/tmp/fmui diff --git a/020_fonts.sh b/020_fonts.sh index 53e1dbd..43f218a 100755 --- a/020_fonts.sh +++ b/020_fonts.sh @@ -6,7 +6,7 @@ set -x # A collection of fonts to install to support nerdfont/powerline patched fonts that are missing. #http://nerdfonts.com/#downloads -#https://github.com/ryanoasis/nerd-fonts/releases/download/v1.1.0/DejaVuSansMono.zip +#http://github.com/ryanoasis/nerd-fonts/releases/download/v1.1.0/DejaVuSansMono.zip RELEASE=$(curl -s https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest | grep tarball_url | cut -d '"' -f 4 | awk -F "/" {'print $8'}) FONT_NAMES=( \ @@ -65,7 +65,7 @@ FONT_DIR=/usr/local/share/fonts/truetype #FONT_DIR=~/.fonts #FONT_DIR=~/.local/share/fonts/truetype -URL_ROOT=https://github.com/ryanoasis/nerd-fonts/releases/download +URL_ROOT=http://github.com/ryanoasis/nerd-fonts/releases/download mkdir -p ${FONT_DIR} mkdir -p ${TMP_DIR} diff --git a/020_fossamail.sh b/020_fossamail.sh index addd3c8..82ec277 100755 --- a/020_fossamail.sh +++ b/020_fossamail.sh @@ -11,7 +11,7 @@ rm -rf /opt/Fossamail-old mv /opt/FossaMail /opt/FossaMail-old tar -xjvf /var/tmp/${FOSSAMAIL_FILENAME} -C /opt -#git clone -b 25.1_RelBranch -single-branch https://github.com/MoonchildProductions/FossaMail /opt/FossaMail +#git clone -b 25.1_RelBranch -single-branch http://github.com/MoonchildProductions/FossaMail /opt/FossaMail bash -c "cat > /usr/share/applications/fossamail.desktop" <<'EOF' [Desktop Entry] diff --git a/020_freecad.sh b/020_freecad.sh index c20f134..036b0c8 100755 --- a/020_freecad.sh +++ b/020_freecad.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# https://github.com/FreeCAD/FreeCAD/releases/ +# http://github.com/FreeCAD/FreeCAD/releases/ # debian is still on 0.16 but 0.17 is needed for current workbenches @@ -112,20 +112,20 @@ sudo apt install -y freecad-daily calculix-ccx elmerfem-csc # https://ftp-master.debian.org/new/opencascade_7.2.0+dfsg1-1.html -# https://github.com/qingfengxia/FenicsSolver +# http://github.com/qingfengxia/FenicsSolver # Available as addon in freecad interface -# https://github.com/jaheyns/CfdFoam +# http://github.com/jaheyns/CfdFoam sudo apt install -y python3-gmsh gmsh sudo apt install -y gnuplot paraview openfoam kicad-packages3d # Openfoam CFD -# https://github.com/qingfengxia/Cfd +# http://github.com/qingfengxia/Cfd # https://forum.freecadweb.org/viewtopic.php?t=21576 # https://opensimsa.github.io/training.htmlGnuplot, Paraview and OpenFOAM -# https://github.com/jaheyns/CfdOF +# http://github.com/jaheyns/CfdOF # Requirements: # * Latest release version of FreeCAD (0.18) or latest development version (0.19 prerelease) # ** or latest development version (0.18 prerelease; requires git commit 12539 or later) diff --git a/020_freerouting.sh b/020_freerouting.sh index e1bb4bb..d28cbc7 100644 --- a/020_freerouting.sh +++ b/020_freerouting.sh @@ -44,7 +44,7 @@ LONG_DESCRIPTION=" Freerouting is a free and advanced PCB autorouter. It can com mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone --branch ${VERSION} https://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} +git clone --branch ${VERSION} http://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} cd ${PACKAGE}-${DEBVERSION} || exit git checkout tags/${VERSION} @@ -111,7 +111,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_git-lfs.sh b/020_git-lfs.sh index 5d00296..0c6b7b3 100755 --- a/020_git-lfs.sh +++ b/020_git-lfs.sh @@ -6,7 +6,7 @@ sudo apt-get install git-lfs ## Using in combination with bfg to remove large binary files from a git repo and replace them with a pointer to a uri/url ## debianized repo -## git clone https://github.com/git-lfs/git-lfs +## git clone http://github.com/git-lfs/git-lfs # ##dist=$(lsb_release -c | cut -f2) #dist=$(cat /etc/devuan_version | awk -F '/' {'print $1'}) diff --git a/020_grc.sh b/020_grc.sh index ce80fb1..a109e41 100755 --- a/020_grc.sh +++ b/020_grc.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -apt install -y grc +sudo apt install -y grc DEST=${1:-/etc/skel} -ALIAS_DIR=".zshrc.d" +ALIAS_DIR=".zsh_aliases.d" ALIAS_HOME=${DEST}/${ALIAS_DIR}/ ALIAS_FILE=${ALIAS_HOME}/003_grc.sh diff --git a/020_jq.sh b/020_jq.sh index fc3c02c..0b187bd 100755 --- a/020_jq.sh +++ b/020_jq.sh @@ -49,7 +49,7 @@ LONG_DESCRIPTION=" jq is like sed for JSON data – you can use it to slice mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -270,7 +270,7 @@ EOF cat > debian/copyright << 'EOF' Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jq -Source: +Source: Files: * Copyright: 2012 Stephen Dolan @@ -662,7 +662,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF @@ -681,7 +681,7 @@ Build-Depends: debhelper (>= 10), rake, ruby-ronn Standards-Version: 3.9.8 -Homepage: https://github.com/stedolan/jq +Homepage: http://github.com/stedolan/jq Vcs-Git: https://anonscm.debian.org/git/collab-maint/jq.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/jq.git diff --git a/020_keepass.sh b/020_keepass.sh index 9d0411b..14f6699 100755 --- a/020_keepass.sh +++ b/020_keepass.sh @@ -5,6 +5,6 @@ RELEASE=$(curl "https://api.github.com/repos/${PROJECT}/releases?per_page=5" | j VERSION=$(echo "${RELEASE}" | cut -c 2- | cut -f1 -d"-") DOWNLOAD_DIR=/tmp -wget -c --directory-prefix "${DOWNLOAD_DIR}" https://github.com/${PROJECT}/releases/download/"${RELEASE}"/keepassxc_"${RELEASE}"_amd64_stable_stretch.deb +wget -c --directory-prefix "${DOWNLOAD_DIR}" http://github.com/${PROJECT}/releases/download/"${RELEASE}"/keepassxc_"${RELEASE}"_amd64_stable_stretch.deb sudo dpkg -i "${DOWNLOAD_DIR}/keepassxc_${RELEASE}_amd64_stable_stretch.deb" sudo apt -y -f install diff --git a/020_kicad.sh b/020_kicad.sh index 069cb82..a6d9d7d 100644 --- a/020_kicad.sh +++ b/020_kicad.sh @@ -43,7 +43,7 @@ sudo apt-get -y install openjdk-11-jre-headless #PROJECT=freerouting/freerouting #RELEASE=$(curl -s https://api.github.com/repos/${PROJECT}/releases/latest | grep tarball_url | cut -d '"' -f 4 | awk -F "/" {'print $8'} | tr -d v) # -#wget -c -P ${PREFIX} https://github.com/${PROJECT}/releases/download/v${RELEASE}/${NAME}-${RELEASE}-linux-x64.zip +#wget -c -P ${PREFIX} http://github.com/${PROJECT}/releases/download/v${RELEASE}/${NAME}-${RELEASE}-linux-x64.zip #unzip ${PREFIX}/${NAME}-${RELEASE}-linux-x64.zip # The freerouter executable can be found here: @@ -52,7 +52,7 @@ sudo apt-get -y install openjdk-11-jre-headless cd /var/tmp ##git clone http://github.com/miho/freerouting -#git clone https://github.com/freerouting/freerouting +#git clone http://github.com/freerouting/freerouting # #cd freerouting #bash gradlew assemble @@ -63,6 +63,6 @@ cd /var/tmp # Color schemes -git clone https://github.com/pointhi/kicad-color-schemes +git clone http://github.com/pointhi/kicad-color-schemes python3 kicad-color-schemes/patch.py kicad-color-schemes/eagle/ ~/.config/kicad/ diff --git a/020_kxstudio.sh b/020_kxstudio.sh index d9eb6a7..085ccd5 100755 --- a/020_kxstudio.sh +++ b/020_kxstudio.sh @@ -4,4 +4,4 @@ # All Debian and Ubuntu users can enable our repositories by installing this deb file: kxstudio-repos.deb. # You can install it manually by running this: -# For the full install instructions see: https://github.com/KXStudio/KXStudio/blob/master/scripts/kxstudio-create-iso +# For the full install instructions see: http://github.com/KXStudio/KXStudio/blob/master/scripts/kxstudio-create-iso diff --git a/020_larynx-git.sh b/020_larynx-git.sh index 029b324..581792a 100644 --- a/020_larynx-git.sh +++ b/020_larynx-git.sh @@ -3,7 +3,6 @@ echo "FIXME" exit() -set -x sudo apt install -y \ dh-autoreconf \ dh-make \ @@ -43,7 +42,7 @@ sed -i 's,^\(DiscoverableTimeout = \).*,\1'\"0\"',' /etc/bluetooth/main.conf mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -101,7 +100,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_lsd.sh b/020_lsd.sh index 44f85a4..eac9866 100755 --- a/020_lsd.sh +++ b/020_lsd.sh @@ -4,7 +4,7 @@ NAME=lsd PROJECT=Peltoche/lsd RELEASE=$(curl -s https://api.github.com/repos/${PROJECT}/releases/latest | grep tarball_url | cut -d '"' -f 4 | awk -F "/" {'print $8'}) -wget -c -P ${PREFIX} https://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb +wget -c -P ${PREFIX} http://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb dpkg -i ${PREFIX}/${NAME}_${RELEASE}_amd64.deb apt -f install diff --git a/020_lxd.sh b/020_lxd.sh index 6548dfa..2e8b7c0 100755 --- a/020_lxd.sh +++ b/020_lxd.sh @@ -90,4 +90,4 @@ apt install -y \ #dget -u http://archive.ubuntu.com/ubuntu/pool/main/l/lxd/lxd_2.21-0ubuntu3~16.04.1.dsc #dget -u http://archive.ubuntu.com/ubuntu/pool/main/l/lxd/lxd_2.21-0ubuntu3~17.10.1.dsc -git clone https://github.com/lxc/lxd-pkg-ubuntu +git clone http://github.com/lxc/lxd-pkg-ubuntu diff --git a/020_mutt-wizard.sh b/020_mutt-wizard.sh index 4db5c2a..06932cc 100755 --- a/020_mutt-wizard.sh +++ b/020_mutt-wizard.sh @@ -63,7 +63,7 @@ PRERELEASE=false ## No releases so no api page other than license so use git repo # CONTENT=$(curl -s ${RELEASES_URL}/latest) # LATEST_URL=$(echo "${CONTENT}" | jq --raw-output '.assets[] | select(.browser_download_url | test("Linux-x86_64")) | .browser_download_url') -LATEST_URL=https://github.com/${USER}/${PROJECT} +LATEST_URL=http://github.com/${USER}/${PROJECT} echo "LATEST_URL: " "${LATEST_URL}" #WORKDIR=$(mktemp -d -p $HOME/tmptmp -t mutt-wizard_build-XXXXXXX) || exit 1 @@ -255,7 +255,7 @@ mkdir -p ${BUILD_DIR}/skel/${ALIAS_DIR}/ echo 'alias mutt="neomutt "' >> ${BUILD_DIR}/skel/${ALIAS_DIR}/002_neomutt.zsh #--------------------------------------------------------------------------------- -## git clone https://github.com/sheoak/neomutt-powerline-nerdfonts.git +## git clone http://github.com/sheoak/neomutt-powerline-nerdfonts.git cat <> ${EXAMPLES}/colorschemes/gruvbox-powerline.neomuttrc # cancel theme colors diff --git a/020_nanorc.sh b/020_nanorc.sh index 2129eab..b99a7cc 100755 --- a/020_nanorc.sh +++ b/020_nanorc.sh @@ -3,7 +3,7 @@ apt install -y nano #apt install -y checkinstall -LATEST_URL=https://github.com/scopatz/nanorc.git +LATEST_URL=http://github.com/scopatz/nanorc.git DIR_NAME=nano-syntax-highlighting/ install_path=/usr/share/${DIR_NAME} mkdir -p $install_path diff --git a/020_neovim-coc.sh b/020_neovim-coc.sh index 8ee24d4..ebc9651 100644 --- a/020_neovim-coc.sh +++ b/020_neovim-coc.sh @@ -1,15 +1,15 @@ ## Coc is an intellisense engine for Vim/Neovim. -# https://github.com/neoclide/coc.nvim -# https://github.com/neoclide/coc-snippets -# https://github.com/neoclide/coc-python -# https://github.com/neoclide/coc-rls +# http://github.com/neoclide/coc.nvim +# http://github.com/neoclide/coc-snippets +# http://github.com/neoclide/coc-python +# http://github.com/neoclide/coc-rls # -# https://github.com/rcjsuen/dockerfile-language-server-nodejs -# https://github.com/mads-hartmann/bash-language-server -# https://github.com/palantir/python-language-server +# http://github.com/rcjsuen/dockerfile-language-server-nodejs +# http://github.com/mads-hartmann/bash-language-server +# http://github.com/palantir/python-language-server -# https://github.com/golang/tools/tree/master/gopls +# http://github.com/golang/tools/tree/master/gopls DEST=/etc/skel NEOVIM_HOME=${DEST}/.config/neovim @@ -31,7 +31,7 @@ declare -A COC_OPT COC_OPT[1]='.["languageserver"] = {"golang": {"command": "gopls", "rootPatterns" = ["go.mod"] , "filetypes" = ["go"] }' -## https://github.com/rcjsuen/dockerfile-language-server-nodejs +## http://github.com/rcjsuen/dockerfile-language-server-nodejs #cat > ${LANGSERVER_CONF} < ${LANGSERVER_CONF} < ${LANGSERVER_CONF} < debian/watch < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_platformio-core_checkinstall.sh b/020_platformio-core_checkinstall.sh index 54670e0..73f2311 100755 --- a/020_platformio-core_checkinstall.sh +++ b/020_platformio-core_checkinstall.sh @@ -20,7 +20,7 @@ mkdir -p "${PIO_BUILD_HOME}" && cd "${PIO_BUILD_HOME}" || exit echo "PlatformIO Core (CLI tool) for embedded programming." > description-pak mkdir -p doc-pak && wget -c --directory-prefix doc-pak https://raw.githubusercontent.com/platformio/platformio-core/develop/README.rst echo "http://docs.platformio.org/en/latest/userguide/index.html" > doc-pak/README -sudo checkinstall -y --fstrans=no pip3 install -U https://github.com/platformio/platformio-core/archive/"${RELEASE}".zip +sudo checkinstall -y --fstrans=no pip3 install -U http://github.com/platformio/platformio-core/archive/"${RELEASE}".zip #wget -c https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py #sudo checkinstall -y --fstrans=no python3 ./get-platformio.py diff --git a/020_podman.sh b/020_podman.sh index f090f48..79f174c 100755 --- a/020_podman.sh +++ b/020_podman.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md +# http://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md # Buildah and podman are redhats implementation of docker containers. @@ -40,14 +40,14 @@ sudo apt -y install \ libapparmor-dev # Install conmon -git clone https://github.com/containers/conmon +git clone http://github.com/containers/conmon cd conmon make sudo make podman sudo cp /usr/local/libexec/podman/conmon /usr/local/bin/ # Install CNI plugins -git clone https://github.com/containernetworking/plugins.git $GOPATH/src/github.com/containernetworking/plugins +git clone http://github.com/containernetworking/plugins.git $GOPATH/src/github.com/containernetworking/plugins cd $GOPATH/src/github.com/containernetworking/plugins ./build_linux.sh sudo mkdir -p /usr/libexec/cni @@ -63,7 +63,7 @@ sudo curl https://raw.githubusercontent.com/projectatomic/registries/master/regi sudo curl https://raw.githubusercontent.com/containers/skopeo/master/default-policy.json -o /etc/containers/policy.json # Install Podman -git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod +git clone http://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod cd $GOPATH/src/github.com/containers/libpod make sudo make install diff --git a/020_pyload.sh b/020_pyload.sh index 03cb4ec..ad34916 100755 --- a/020_pyload.sh +++ b/020_pyload.sh @@ -5,7 +5,7 @@ PROJECT=pyload/pyload RELEASE=$(curl -s https://api.github.com/repos/${PROJECT}/releases/latest | grep tarball_url | cut -d '"' -f 4 | awk -F "/" {'print $8'}) -wget -c -P ${PREFIX} https://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb +wget -c -P ${PREFIX} http://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb dpkg -i ${PREFIX}/${NAME}_${RELEASE}_amd64.deb apt install -f diff --git a/020_python-jf.sh b/020_python-jf.sh index d6f9f92..d71d4fd 100755 --- a/020_python-jf.sh +++ b/020_python-jf.sh @@ -7,4 +7,4 @@ JF_BUILD_HOME=/var/tmp/python-jf-"${RELEASE}" mkdir -p "${JF_BUILD_HOME}" && cd "${JF_BUILD_HOME}" || exit echo "JF, is a jq-clone written in python. It supports evaluation of python oneliners, making it especially appealing for data scientists who are used to working with python." > description-pak mkdir -p doc-pak && wget -c --directory-prefix doc-pak https://raw.githubusercontent.com/${PROJECT}/develop/README.rst -sudo checkinstall --fstrans=no pip install -U https://github.com/${PROJECT}/archive/"${RELEASE}".zip +sudo checkinstall --fstrans=no pip install -U http://github.com/${PROJECT}/archive/"${RELEASE}".zip diff --git a/020_rancher-k3d.sh b/020_rancher-k3d.sh index 0f9f45b..daf8815 100755 --- a/020_rancher-k3d.sh +++ b/020_rancher-k3d.sh @@ -91,7 +91,7 @@ cat > ./install-it.sh << EOF #TAG=${RELEASE} bash install.sh echo "Installing release ${RELEASE} " -curl -SsL https://github.com/rancher/k3d/releases/download/${RELEASE}/k3d-linux-amd64 -o /usr/local/bin/k3d +curl -SsL http://github.com/rancher/k3d/releases/download/${RELEASE}/k3d-linux-amd64 -o /usr/local/bin/k3d chmod +x /usr/local/bin/k3d EOF diff --git a/020_rox-filer.sh b/020_rox-filer.sh index f6a6e20..ef82a8a 100755 --- a/020_rox-filer.sh +++ b/020_rox-filer.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # ROX-Filer settings sudo apt install -y rox-filer sudo apt install -y xmlstarlet @@ -151,7 +152,7 @@ cat > ${ROXFILER_HOME}/ROX-Filer/Options <<'EOF' - + @@ -223,7 +224,7 @@ cat > ${ROXFILER_HOME}/ROX-Filer/Options <<'EOF' - + diff --git a/020_sanoid.sh b/020_sanoid.sh index d00cb29..b678b6c 100755 --- a/020_sanoid.sh +++ b/020_sanoid.sh @@ -24,7 +24,7 @@ LONG_DESCRIPTION="Create, thin, and monitor snapshots and pool health from a sin mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -77,7 +77,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF cp -a packages/debian/* debian diff --git a/020_themes.sh b/020_themes.sh index ff63fdf..7b9e72f 100755 --- a/020_themes.sh +++ b/020_themes.sh @@ -1,12 +1,14 @@ #!/usr/bin/env bash -apt install -y mate-themes -apt install -y albatross-gtk-theme -apt install -y blackbird-gtk-theme +sudo apt install -y mate-themes +sudo apt install -y albatross-gtk-theme +sudo apt install -y blackbird-gtk-theme +sudo apt install -y adwaita-icon-theme +sudo apt install -y adwaita-qt apt install -y gtk2-engines-murrine gtk2-engines-pixbuf cd /var/tmp -git clone https://github.com/vinceliuice/stylish-gtk-theme +git clone http://github.com/vinceliuice/stylish-gtk-theme cd stylish-gtk-theme ./Install diff --git a/020_tldr.sh b/020_tldr.sh index f69e15c..a196889 100644 --- a/020_tldr.sh +++ b/020_tldr.sh @@ -6,7 +6,7 @@ ALIAS_DIR=".zshrc.d" mkdir -p ${TLDR_CONFIG_DIR} cd ${HOME} -git clone https://github.com/tldr-pages/tldr.git .tldr +git clone http://github.com/tldr-pages/tldr.git .tldr cat > ${HOME}/${ALIAS_DIR}/003_tldr.zsh < ${DEST}/.config/tmux/default.sh << 'EOF' @@ -88,7 +88,7 @@ cat > ${DEST}/.config/tmux/tmux.conf << 'EOF' source /usr/share/powerline/bindings/tmux/powerline_tmux_1.9_plus.conf # set-option -g default-shell /bin/fish set-option -g default-shell "/usr/bin/zsh" -# https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard +# http://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard set-option -g status on set-option -g status-interval 2 # set-option -g status-utf8 on @@ -202,7 +202,7 @@ run '/usr/share/tmux-plugin-manager/tpm' EOF ## A Tmux theme made to work together with bullet-train.zsh -#https://github.com/caiogondim/maglev +#http://github.com/caiogondim/maglev # Depends: Tmux Pain Control Optional: # Tmux copycat Tmux prefix highlight @@ -292,8 +292,8 @@ EOF # tmux session manager examples. include in your project directory as .tmuxp.{yaml,json} -# and load with 'tmuxp load .' -# see https://github.com/tony/tmuxp-config +# and load with 'tmuxp load .' or 'tmuxp.load {name}' +# see http://github.com/tony/tmuxp-config cat > ${DEST}/.tmuxp/docker.yaml < ${DEST}/.tmuxp/tmuxp.yaml << EOF +session_name: tmuxp +start_directory: ./ # load session relative to config location (project root). +before_script: ./.tmuxp-before-script.sh +shell_command_before: +- '[ -f .venv/bin/activate ] && source .venv/bin/activate && reset' +windows: +- window_name: tmuxp + focus: True + layout: main-horizontal + options: + main-pane-height: 35 + panes: + - focus: true + - pane + - make watch_test +- window_name: docs + layout: main-horizontal + options: + main-pane-height: 35 + start_directory: doc/ + panes: + - focus: true + - pane + - make serve + - make SPHINXBUILD='poetry run sphinx-build' watch +EOF + +cat > ${DEST}/.tmuxp/tmuxp_testing.yaml << EOF +language: python +sudo: false +dist: bionic # 18.04 +python: + - 2.7 + - 3.7 + - pypy3 +if: (type = push AND branch IN (master)) OR (type = pull_request) +env: + global: + - RETRY_TIMEOUT_SECONDS=15 + matrix: + - TMUX_VERSION=master + - TMUX_VERSION=3.0a + - TMUX_VERSION=2.9 + - TMUX_VERSION=2.8 + - TMUX_VERSION=2.8 + - TMUX_VERSION=2.7 + - TMUX_VERSION=2.6 + - TMUX_VERSION=2.5 + - TMUX_VERSION=2.4 + - TMUX_VERSION=2.3 + - TMUX_VERSION=2.2 + - TMUX_VERSION=2.1 + - TMUX_VERSION=2.0 + - TMUX_VERSION=1.9a + - TMUX_VERSION=1.8 +matrix: + finish_fast: true + allow_failures: + - env: TMUX_VERSION=master + - python: pypy3 +cache: + - pip + - apt + - directories: + - ~/source + - ~/build +before_install: + - pip install poetry + - poetry --version + - poetry version +install: + - poetry install -v +before_script: + - mkdir -p ~/source + - mkdir -p ~/build/tmux-$TMUX_VERSION + - if [[ ! -d ~/source/tmux-$TMUX_VERSION ]]; then git clone https://github.com/tmux/tmux.git ~/source/tmux-$TMUX_VERSION; fi + - cd ~/source/tmux-$TMUX_VERSION + - git checkout $TMUX_VERSION + - export PATH=$HOME/build/tmux-$TMUX_VERSION/bin:$PATH + - if [[ $TMUX_VERSION == "master" || ! $(tmux -V | grep $TMUX_VERSION) ]]; then sh autogen.sh; fi + - if [[ $TMUX_VERSION == "master" || ! $(tmux -V | grep $TMUX_VERSION) ]]; then ./configure --prefix=$HOME/build/tmux-$TMUX_VERSION && make && make install; fi + - cd $TRAVIS_BUILD_DIR + - tmux -V +script: + - poetry run py.test --cov + - make flake8 +addons: + apt: + packages: + - libevent-dev + - libncurses-dev +after_success: + - codecov +EOF diff --git a/020_ubuntu-kernels.sh b/020_ubuntu-kernels.sh index b43c85a..2d1577d 100755 --- a/020_ubuntu-kernels.sh +++ b/020_ubuntu-kernels.sh @@ -56,8 +56,8 @@ wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-image-unsi wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-modules-5.7.0-050700rc6-generic_5.7.0-050700rc6.202005172030_${ARCH}.deb # https://gitlab.com/ayufan-repos/rock64/linux-mainline-kernel/-/tree/mainline-master -wget -c https://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-headers-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb -wget -c https://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-image-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb +wget -c http://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-headers-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb +wget -c http://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-image-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb sudo dpkg -i *.deb sudo apt-get update diff --git a/020_unetbootin.sh b/020_unetbootin.sh index 4d5f346..631aa77 100755 --- a/020_unetbootin.sh +++ b/020_unetbootin.sh @@ -8,7 +8,7 @@ VERSION=661 cd /var/tmp -wget -c https://github.com/unetbootin/unetbootin/releases/download/${VERSION}/unetbootin-linux64-${VERSION}.bin +wget -c http://github.com/unetbootin/unetbootin/releases/download/${VERSION}/unetbootin-linux64-${VERSION}.bin chmod +x ./unetbootin-linux64-${VERSION}.bin apt install -y p7zip-full ./unetbootin-linux64-${VERSION}.bin diff --git a/020_vcsh.sh b/020_vcsh.sh index ac0f0bf..7050286 100755 --- a/020_vcsh.sh +++ b/020_vcsh.sh @@ -12,7 +12,7 @@ # To see the current remote repository. # "vcsh mr remote show origin" # "vcsh mr remote remove origin" -# "vcsh mr remote add origin https://github.com/crazzyfool/mr.git" +# "vcsh mr remote add origin http://github.com/crazzyfool/mr.git" # "vcsh mr push --set-upstream origin master" # These can be aliased in the config file. See below diff --git a/020_vim.sh b/020_vim.sh index bb27cbd..bebe742 100755 --- a/020_vim.sh +++ b/020_vim.sh @@ -2,6 +2,8 @@ set -x sudo apt install -y powerline grip pandoc pandoc #vim-airline vim-airline-themes +DEST=${1:-/etc/skel} + # Jupyter - prepare jupyter virtualenv for jupyter-vim #sudo apt-get install -y jupyter jupyter-core @@ -29,7 +31,6 @@ sed -i '/^# c.ZMQTerminalInteractiveShell.include_other_output =.*/ s/.*/&\nc.ZM # ale supported programs sudo apt install -y isort mypy prospector pycodestyle pydocstyle python3-pyflakes python3-pylama python3-pylint-flask python3-pylint-django python3-pylint-common python3-pylint-celery -DEST=${1:-/etc/skel} sudo sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc sudo sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc @@ -131,7 +132,7 @@ EOF # Xresources-hybrid-reduced-contrast cat > ${DEST}/.Xresources << 'EOF' ! Hybrid Terminal Colours. Uses the palette from Tomorrow-Night: -! https://github.com/chriskempson/tomorrow-theme/blob/master/vim/colors/Tomorrow-Night.vim +! http://github.com/chriskempson/tomorrow-theme/blob/master/vim/colors/Tomorrow-Night.vim ! and the reduced contrast background color from Codecademy's online editor: ! https://www.codecademy.com/learn ! vim: ft=xdefaults @@ -166,7 +167,7 @@ EOF cd ${DEST} || exit sudo apt install -y git -git clone https://github.com/VundleVim/Vundle.vim.git ${DEST}/.vim/bundle/Vundle.vim +git clone http://github.com/VundleVim/Vundle.vim.git ${DEST}/.vim/bundle/Vundle.vim # Prepend to the .vimrc if [ -f ${DEST}/.vimrc_pending ];then @@ -237,7 +238,7 @@ Plugin 'honza/vim-snippets' " requires tmux.conf setting: set -g focus-events on or tmux-plugins/tmux-sensible plugin. Plugin 'tmux-plugins/vim-tmux-focus-events' -" text objects - https://github.com/kana/vim-textobj-user/wiki +" text objects - http://github.com/kana/vim-textobj-user/wiki Plugin 'kana/vim-textobj-user' Plugin 'bps/vim-textobj-python' @@ -309,8 +310,8 @@ Plugin 'plasticboy/vim-markdown' Plugin 'iamcco/markdown-preview.nvim' -let vim_markmdown_preview_github=1 -"let vim_markmdown_preview_pandoc=1 +let vim_markdown_preview_github=1 +"let vim_markdown_preview_pandoc=1 let vim_markdown_preview_toggle=1 let vim_markdown_preview_hotkey='' @@ -349,7 +350,7 @@ Plugin 'thosakwe/vim-flutter' "nnoremap fR :FlutterHotRestart "nnoremap fD :FlutterVisualDebug -" COC intellisense engine https://github.com/neoclide/coc.nvim/wiki/Install-coc.nvim +" COC intellisense engine http://github.com/neoclide/coc.nvim/wiki/Install-coc.nvim Plugin 'neoclide/coc.nvim' Plugin 'tjdevries/coc-zsh' @@ -527,8 +528,8 @@ xmap a (coc-codeaction-selected) nmap a (coc-codeaction-selected) # Add platformio support to Coc. See: -# https://github.com/MaskRay/ccls/wiki/coc.nvim -# https://github.com/neoclide/coc.nvim/blob/101175f47c15ff11eb599c617ef895f578f758b8/doc/coc.txt +# http://github.com/MaskRay/ccls/wiki/coc.nvim +# http://github.com/neoclide/coc.nvim/blob/101175f47c15ff11eb599c617ef895f578f758b8/doc/coc.txt # Configuration is stored at: # `$HOME/.vim/coc-settings.json` or # `$HOME/.config/nvim/coc-settings.json` by default) diff --git a/020_vosk.sh b/020_vosk.sh index e1239f7..cf66540 100644 --- a/020_vosk.sh +++ b/020_vosk.sh @@ -3,7 +3,7 @@ pip3 install vosk -git clone https://github.com/alphacep/vosk-api +git clone http://github.com/alphacep/vosk-api cd vosk-api/python/example diff --git a/020_vscode.sh b/020_vscode.sh index aa8d4b4..c9c2383 100644 --- a/020_vscode.sh +++ b/020_vscode.sh @@ -3,8 +3,8 @@ echo "Uses the Open VSX extension registry. rather than the microsoft registry" echo "like atom, the license of vscode-cpptools prevents using it out of non-free" echo "MS VS Code and platformio depends on it. Until platformio can support clang" echo "via vscode-clangd instead pio cannot be distributed via VSX registry." -echo "See: https://github.com/platformio/platformio-vscode-ide/issues/1802" -echo " https://github.com/clangd/vscode-clangd" +echo "See: http://github.com/platformio/platformio-vscode-ide/issues/1802" +echo " http://github.com/clangd/vscode-clangd" #wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg \ # | gpg --dearmor \ diff --git a/020_waterfox.sh b/020_waterfox.sh index c0e22b5..2b84ea7 100755 --- a/020_waterfox.sh +++ b/020_waterfox.sh @@ -209,7 +209,7 @@ done # Themes ## Australis Dark - enabled in Firefox 53 ## Has rounded corners on active tab and grey surround -# https://github.com/wilfredwee/australis-dark +# http://github.com/wilfredwee/australis-dark # https://addons.mozilla.org/en-US/firefox/addon/devedition-theme-enabler/ #https://addons.mozilla.org/firefox/downloads/file/477584/developer_edition_theme_enabler-1.0.1-fx.xpi diff --git a/020_youtube-dl.sh b/020_youtube-dl.sh index 50de78f..bbff200 100755 --- a/020_youtube-dl.sh +++ b/020_youtube-dl.sh @@ -2,7 +2,7 @@ apt install -y youtube-dl -## https://github.com/rg3/youtube-dl/blob/master/README.md#configuration +## http://github.com/rg3/youtube-dl/blob/master/README.md#configuration # Reduce maximum video quality echo "-f 'bestvideo[height<=720]+bestaudio/best[height<=720]'" >> /etc/youtube-dl.conf diff --git a/020_yq.sh b/020_yq.sh index 0410802..9c28159 100755 --- a/020_yq.sh +++ b/020_yq.sh @@ -29,8 +29,8 @@ LONG_DESCRIPTION=" Command-line YAML and XML processor\\n jq wrapper for YAML/XM mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -#git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} -git clone --branch ${VERSION} https://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} +#git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone --branch ${VERSION} http://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} cd ${PACKAGE}-${DEBVERSION} || exit git checkout tags/${VERSION} @@ -91,7 +91,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/020_zfs-auto-snapshot.sh b/020_zfs-auto-snapshot.sh index 7e89b50..fffaa3e 100755 --- a/020_zfs-auto-snapshot.sh +++ b/020_zfs-auto-snapshot.sh @@ -12,7 +12,7 @@ apt install -y zfs-auto-snapshot #ZSH_BUILD_HOME=/var/tmp/zfs-auto-snapshot #mkdir -p ${ZSH_BUILD_HOME} && \ # cd ${ZSH_BUILD_HOME} && \ -# git clone https://github.com/zfsonlinux/zfs-auto-snapshot.git && \ +# git clone http://github.com/zfsonlinux/zfs-auto-snapshot.git && \ # cd ${ZSH_BUILD_HOME}/zfs-auto-snapshot &&\ # git merge origin/debian && \ # dpkg-buildpackage -b -uc -us && \ diff --git a/020_zfs-sanoid.sh b/020_zfs-sanoid.sh index b0f2e03..0dd2770 100755 --- a/020_zfs-sanoid.sh +++ b/020_zfs-sanoid.sh @@ -2,7 +2,7 @@ apt install -y libconfig-inifiles-perl git cd /opt -git clone https://github.com/jimsalterjrs/sanoid +git clone http://github.com/jimsalterjrs/sanoid ln -s /opt/sanoid/sanoid /usr/sbin/ diff --git a/020_zfs-znapzend.sh b/020_zfs-znapzend.sh index e5abeda..fbfe83f 100755 --- a/020_zfs-znapzend.sh +++ b/020_zfs-znapzend.sh @@ -4,7 +4,7 @@ apt install -y mbuffer ## Using checkinstall #ZZ_VERSION=0.17.0 #cd /var/tmp -#wget -c https://github.com/oetiker/znapzend/releases/download/v${ZZ_VERSION}/znapzend-${ZZ_VERSION}.tar.gz +#wget -c http://github.com/oetiker/znapzend/releases/download/v${ZZ_VERSION}/znapzend-${ZZ_VERSION}.tar.gz #tar zxvf znapzend-${ZZ_VERSION}.tar.gz #cd znapzend-${ZZ_VERSION} #./configure --prefix=/opt/znapzend-${ZZ_VERSION} @@ -17,10 +17,10 @@ apt install -y mbuffer ZFS_BUILD_HOME=/var/tmp/zfs-auto-snapshot mkdir -p ${ZFS_BUILD_HOME} cd ${ZFS_BUILD_HOME} -git clone https://github.com/oetiker/znapzend/ +git clone http://github.com/oetiker/znapzend/ cd znapzend -git clone https://github.com/Gregy/znapzend-debian /tmp/debian +git clone http://github.com/Gregy/znapzend-debian /tmp/debian mv /tmp/debian/debian ${ZFS_BUILD_HOME}/znapzend rm -rf /tmp/debian diff --git a/020_zfs-znapzend_checkinstall.sh b/020_zfs-znapzend_checkinstall.sh index cdccb1e..042f0b2 100755 --- a/020_zfs-znapzend_checkinstall.sh +++ b/020_zfs-znapzend_checkinstall.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ZZ_VERSION=0.17.0 cd /var/tmp -wget -c https://github.com/oetiker/znapzend/releases/download/v${ZZ_VERSION}/znapzend-${ZZ_VERSION}.tar.gz +wget -c http://github.com/oetiker/znapzend/releases/download/v${ZZ_VERSION}/znapzend-${ZZ_VERSION}.tar.gz tar zxvf znapzend-${ZZ_VERSION}.tar.gz cd znapzend-${ZZ_VERSION} ./configure --prefix=/opt/znapzend-${ZZ_VERSION} diff --git a/020_zsh.sh b/020_zsh.sh index 95a7c0e..91bb393 100755 --- a/020_zsh.sh +++ b/020_zsh.sh @@ -241,7 +241,7 @@ cat > ${DEST}/.zshrc.d/001_vi-mode.sh << 'EOF' bindkey '^R' history-incremental-search-backward EOF -#git clone https://github.com/bhilburn/powerlevel9k.git ${DEST}/.zgen/robbyrussell/oh-my-zsh-master/themes/powerlevel9k +#git clone http://github.com/bhilburn/powerlevel9k.git ${DEST}/.zgen/robbyrussell/oh-my-zsh-master/themes/powerlevel9k ## add a separate zsh aliases directory #echo > ${DEST}/.zshrc << 'EOF' diff --git a/020_zsh_quickstart.sh b/020_zsh_quickstart.sh index ab72fd6..f769210 100755 --- a/020_zsh_quickstart.sh +++ b/020_zsh_quickstart.sh @@ -30,8 +30,8 @@ ALIAS_DIR=".zshrc.d" apt install -y git # Install zgen plugin manager and zsh quicktart to get a default setup for zsh -git clone https://github.com/tarjoilija/zgen ${DEST}/zgen # available with apt install zgen which installs to /usr/share/zgen -git clone https://github.com/unixorn/zsh-quickstart-kit ${DEST}/zsh-quickstart-kit +git clone http://github.com/tarjoilija/zgen ${DEST}/zgen # available with apt install zgen which installs to /usr/share/zgen +git clone http://github.com/unixorn/zsh-quickstart-kit ${DEST}/zsh-quickstart-kit mkdir -p ${DEST}/.zgen/robbyrussell/ git clone http://github.com/ohmyzsh/ohmyzsh ${DEST}/.zgen/robbyrussell/ohmyzsh @@ -239,7 +239,7 @@ cat > ${DEST}/.zshrc.d/001_vi-mode.sh << 'EOF' EOF -#git clone https://github.com/bhilburn/powerlevel9k.git ${DEST}/.zgen/robbyrussell/oh-my-zsh-master/themes/powerlevel9k +#git clone http://github.com/bhilburn/powerlevel9k.git ${DEST}/.zgen/robbyrussell/oh-my-zsh-master/themes/powerlevel9k ## add a separate zsh aliases directory ALIAS_DIR=.zsh_aliases.d diff --git a/020_zsh_zgenom.sh b/020_zsh_zgenom.sh index 1cea7d6..8aec0e5 100644 --- a/020_zsh_zgenom.sh +++ b/020_zsh_zgenom.sh @@ -5,7 +5,7 @@ #cat >> ${HOME}/.zshrc <> ${HOME}/.zshrc <&1 >/dev/null; then # if [ $TERM != "screen-256color" ] && [ $TERM != "screen" ]; then # tmux attach -t hack || tmux new -s hack; exit diff --git a/025_xfce4-theme-fix.sh b/025_xfce4-theme-fix.sh index 3bea859..96d1fe7 100755 --- a/025_xfce4-theme-fix.sh +++ b/025_xfce4-theme-fix.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Fix one pixel window grab # http://sevkeifert.blogspot.ca/2014/12/increase-window-border-size-in-xubuntu.html -# https://github.com/shimmerproject/Numix/commit/31ae74ab28a1a9af16c00a394ab30161c86cd48d +# http://github.com/shimmerproject/Numix/commit/31ae74ab28a1a9af16c00a394ab30161c86cd48d themes_home=/usr/share/themes theme_name=Greybird diff --git a/broot-install.txt b/broot-install.txt index 827559f..811506b 100644 --- a/broot-install.txt +++ b/broot-install.txt @@ -1,4 +1,4 @@ -Broot should be launched using a shell function (see https://github.com/Canop/broot for explanations). +Broot should be launched using a shell function (see http://github.com/Canop/broot for explanations). The function is either missing, old or badly installed. Can I install it now? [Y n] y diff --git a/build_deb_from_git.sh b/build_deb_from_git.sh index c083b88..9083977 100755 --- a/build_deb_from_git.sh +++ b/build_deb_from_git.sh @@ -47,7 +47,7 @@ sed -i 's,^\(DiscoverableTimeout = \).*,\1'\"0\"',' /etc/bluetooth/main.conf mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone https://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} +git clone http://github.com/${USER}/${PROJECT}.git ${PACKAGE}-${VERSION} cd ${PACKAGE}-${VERSION} || exit @@ -98,7 +98,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b @@ -127,7 +127,7 @@ export LIBASOUND_THREAD_SAFE=0 # autostart bluealsa #cat < /etc/rc.local -## Start bluealsa as root +## Start bluealsa as root #export LIBASOUND_THREAD_SAFE=0 #/usr/bin/bluealsa -S & #EOF @@ -173,9 +173,9 @@ export LIBASOUND_THREAD_SAFE=0 ## ## AOSP libldac dispatcher ## https://android.googlesource.com/platform/external/libldac -## https://github.com/EHfive/ldacBT +## http://github.com/EHfive/ldacBT -#git clone https://github.com/EHfive/ldacBT.git +#git clone http://github.com/EHfive/ldacBT.git #cd ldacBT #git submodule update --init # @@ -189,6 +189,6 @@ export LIBASOUND_THREAD_SAFE=0 #------------------------------------------------------------------------ ## [open]aptx - reverse-engineered apt-X -## https://github.com/Arkq/openaptx +## http://github.com/Arkq/openaptx #------------------------------------------------------------------------ diff --git a/compare_docker_selections.sh b/compare_docker_selections.sh new file mode 100644 index 0000000..05c4c73 --- /dev/null +++ b/compare_docker_selections.sh @@ -0,0 +1,13 @@ +CONTAINER1=${1:-registry.gitlab.com/paddy-hack/devuan/slim:chimaera} +#CONTAINER1=${1:-dyne/devuan:ceres} +#CONTAINER2=${2:-devuan:stable-slim} +#CONTAINER1=${1:-debian:bookworm} +CONTAINER2=${2:-debian:bookworm-slim} + +docker pull $CONTAINER1 +docker pull $CONTAINER2 + +docker run --rm ${CONTAINER1} dpkg --get-selections >/tmp/container3-pkgs.txt +docker run --rm ${CONTAINER2} dpkg --get-selections >/tmp/container4-pkgs.txt + +gvimdiff /tmp/container3-pkgs.txt /tmp/container4-pkgs.txt diff --git a/docker_daemon-writer.sh b/docker_daemon-writer.sh index 57a4960..4047668 100644 --- a/docker_daemon-writer.sh +++ b/docker_daemon-writer.sh @@ -27,7 +27,7 @@ DOCKER_OPT[21]='.["max-concurrent-uploads"] = 5' DOCKER_OPT[22]='.["default-shm-size"] = "64M"' DOCKER_OPT[23]='.["shutdown-timeout"] = 15' DOCKER_OPT[24]='.["debug"] = true' -DOCKER_OPT[25]='.["hosts"] = ["tcp://192.168.59.3:2376"]' +DOCKER_OPT[25]='.["hosts"] = ["unix:///var/run/docker.sock", "tcp://192.168.59.3:2376"]' DOCKER_OPT[26]='.["log-level"] = ""' DOCKER_OPT[27]='.["tls"] = true' DOCKER_OPT[28]='.["tlsverify"] = true' diff --git a/get-gitlab_runner.sh b/get-gitlab_runner.sh new file mode 100644 index 0000000..c1351b6 --- /dev/null +++ b/get-gitlab_runner.sh @@ -0,0 +1,34 @@ + +GITLAB_URL="git.ring-zero.co.uk" +#GITLAB_URL="192.168.1.195" # 192.168.1.48 +GITLAB_PORT="443" # 10022:22 32768:443 10080:80 +#GITLAB_PORT="32768" # 10022:22 32768:443 10080:80 +#GITLAB_PORT="10080" # 10022:22 32768:443 10080:80 +#GITLAB_PORT="10022" # 10022:22 32768:443 10080:80 +GITLAB_USER="cyteen" + +#PROTO="https" # http +PROTO="http" # http +CURL_OPTIONS="--insecure" + +PRIVATE_TOKEN="P8mHeR6ASfAsHeqQKdvg" # ${PROTO}://${GITLAB_URL}/profile/personal_access_tokens //*[@id="feed_token"] +RSA_KEY=$(cat ${HOME}/.ssh/id_rsa.pub) + +curl ${CURL_OPTIONS} --header "PRIVATE-TOKEN ${PRIVATE_TOKEN}" "${PROTO}://${GITLAB_URL}/api/v4/runners" + +## Send +#echo "" +#echo "Sending key." +#echo "COMMAND: curl ${CURL_OPTIONS} -d '{"title":"test key","key":"'"${RSA_KEY}"'"}' -H 'Content-Type: application/json' ${PROTO}://${GITLAB_URL}:${GITLAB_PORT}/api/v4/user/keys?private_token=${PRIVATE_TOKEN}" +#curl ${CURL_OPTIONS} -d '{"title":"test key","key":"'"${RSA_KEY}"'"}' -H 'Content-Type: application/json' ${PROTO}://${GITLAB_URL}:${GITLAB_PORT}/api/v4/user/keys?private_token=${PRIVATE_TOKEN} +# +## {"id":3889765,"title":"test key","key":"ssh-rsa ","created_at":"2019-08-01T21:26:40.952Z"} +# +# +## Test +#echo "" +#echo "Testing key." +#echo "COMMAND: curl ${CURL_OPTIONS} ${PROTO}://${GITLAB_URL}:${GITLAB_PORT}/api/v4/user/keys?private_token=${PRIVATE_TOKEN}" +#curl ${CURL_OPTIONS} ${PROTO}://${GITLAB_URL}:${GITLAB_PORT}/api/v4/user/keys?private_token=${PRIVATE_TOKEN} +# +# [{"id":3889765,"title":"test key","key":"ssh-rsa ","created_at":"2019-08-01T21:26:40.952Z"}] diff --git a/git-kicad.sh b/git-kicad.sh index 6723c3d..a9abc96 100644 --- a/git-kicad.sh +++ b/git-kicad.sh @@ -32,5 +32,5 @@ git config --global filter.kicad_sch.smudge cat # #chmod +x ${HOME}/bin/git-imgdiff -#see: https://github.com/jnavila/plotkicadsch +#see: http://github.com/jnavila/plotkicadsch # https://jnavila.github.io/plotkicadsch/plotgitsch_usersguide.html diff --git a/onivim2.sh b/onivim2.sh index 31a39e2..e7f3946 100755 --- a/onivim2.sh +++ b/onivim2.sh @@ -19,7 +19,7 @@ DESCRIPTION="An editor that aims to bring the speed of Sublime, the language int mkdir -p ${BUILD_HOME} cd ${BUILD_HOME} || exit -git clone --branch ${VERSION} https://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} +git clone --branch ${VERSION} http://github.com/${USER}/${PROJECT}.git --depth 1 ${PACKAGE}-${DEBVERSION} cd ${PACKAGE}-${DEBVERSION} || exit git checkout tags/${VERSION} @@ -61,7 +61,7 @@ echo **************** BUILD_OPTIONS="--buildsystem=none" # build dependencies: git, node, esy (like npm for native code: Reason, OCaml...) -# https://github.com/revery-ui/revery/wiki/Building-&-Installing +# http://github.com/revery-ui/revery/wiki/Building-&-Installing # apt install nodejs npm cat < debian/rules @@ -89,7 +89,7 @@ EOF cat < debian/watch version=4 opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/${PROJECT}-$1\.tar\.gz/ \ - https://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz + http://github.com/${USER}/${PROJECT}/tags .*/v?(\d\S+)\.tar\.gz EOF dpkg-buildpackage -us -uc -b diff --git a/redis_THP_latancy.txt b/redis_THP_latancy.txt new file mode 100644 index 0000000..b22d063 --- /dev/null +++ b/redis_THP_latancy.txt @@ -0,0 +1,27 @@ +# WARNING you have Transparent Huge Pages (THP) support enabled in your kernel. +# This will create latency and memory usage issues with Redis. +# To fix this issue run the command +# 'echo never > /sys/kernel/mm/transparent_hugepage/enabled' as root, +# and add it to your /etc/rc.local in order to retain the setting after a reboot. +# Redis must be restarted after THP is disabled. + +# https://www.golinuxhub.com/2018/08/enable-or-disable-transparent-anon-hugepage-thp-check-status-examples-linux/ + +echo never > /sys/kernel/mm/transparent_hugepage/enabled +GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT transparent_hugepage=never" + +echo 'vm.nr_hugepages=0' > /etc/sysctl.d/01-disable-vm.nr_hugepages + +# WARNING: The TCP backlog setting of 511 cannot be enforced because +# /proc/sys/net/core/somaxconn is set to the lower value of 128. + +# WARNING overcommit_memory is set to 0! Background save may fail under low memory +# condition. To fix this issue add: + +echo 'vm.overcommit_memory = 1' > /etc/sysctl.d/01-enable-vm.overcommit_memory + +# and then reboot or run the command: + +'sysctl vm.overcommit_memory=1' + +# for this to take effect. diff --git a/stylus_global-dark-theme_colours.txt b/stylus_global-dark-theme_colours.txt new file mode 100644 index 0000000..49c328c --- /dev/null +++ b/stylus_global-dark-theme_colours.txt @@ -0,0 +1,10 @@ +Link text color #173ae6 +Visited link text color #fc8c4a +Selected text background color #0070bb +Selected text color #FEFEFE +Page background color #2E2E31 +Scrollbar thumb color #bababa +Scrollbar track color #353535 +Scrollbar width (Firefox) Thin +Scrollbar width (Chrome/Chromium) Thin +Show scrollbar buttons (Chrome/Chromium) Show