Change apt-get to the newer apt.

001_apt-sources.sh

@@ -63,7 +63,7 @@ EOF
 ln -sf "${AVAILABLE}"/docker.list "${ACTIVE}"/docker.list
 bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
 
-apt-get update && apt-get install -y --force-yes devuan-keyring
+apt update && apt install -y --force-yes devuan-keyring
 
 #bash -c "cat > /etc/apt/sources.list.d/x2go.list" <<'EOF'
 ## apt-key adv --recv-keys --keyserver keys.gnupg.net E1F958385BFE2B6E
@@ -79,5 +79,5 @@ apt-get update && apt-get install -y --force-yes devuan-keyring
 ## X2Go Repository (sources of nightly builds)
 ##deb-src http://packages.x2go.org/debian jessie heuler
 #
-## apt-get install x2goserver x2goserver-xsession
+## apt install -y x2goserver x2goserver-xsession
 #EOF

001_enable-binfmt-misc.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-sudo apt-get install -y --reinstall qemu qemu-user-static binfmt-support
+sudo apt install -y --reinstall qemu qemu-user-static binfmt-support
 sudo update-binfmts --enable qemu-aarch64
 
 sudo sed -i '10s/^$/yes/g' /var/lib/binfmts/qemu-arm /var/lib/binfmts/qemu-aarch64

001_locales.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Set env
-apt-get -y install locales
+apt install -y locales
 locale-gen "en_GB.UTF-8"
 export MYLANGUAGE="en_GB.UTF-8"
 export MYLANG="en_GB.UTF-8"

001_resolvconf.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install --reinstall resolvconf
+apt install -y --reinstall resolvconf
 mkdir -p /etc/resolvconf/resolv.conf.d/
 bash -c 'echo "nameserver 94.247.43.254" >> /etc/resolvconf/resolv.conf.d/head'
 bash -c 'echo "nameserver 212.159.6.10" >> /etc/resolvconf/resolv.conf.d/head'

010_alsa.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y remove --purge pulseaudio pulseaudio-module-x11 pulseaudio-utils pavucontrol gstreamer1.0-pulseaudio pacman pavumeter pavucontrol
+apt remove -y --purge pulseaudio pulseaudio-module-x11 pulseaudio-utils pavucontrol gstreamer1.0-pulseaudio pacman pavumeter pavucontrol
 
 DEST=/etc/skel
 
@@ -12,8 +12,8 @@ DEST=/etc/skel
 #rm -r $HOME/.config/pulse
 #rm -rf /tmp/pulse*
 
-apt-get -y install alsa-tools alsa-tools-gui alsa-utils alsa-oss alsamixergui volumeicon-alsa libalsaplayer0
-apt-get -y install pnmixer
+apt install -y alsa-tools alsa-tools-gui alsa-utils alsa-oss alsamixergui volumeicon-alsa libalsaplayer0
+apt install -y pnmixer
 
 /etc/init.d/alsa-utils restart
 

010_apt-get.sh

@@ -1,67 +1,68 @@
 #!/usr/bin/env bash
-apt-get -y install software-properties-common apt-transport-https wget curl lvm2
-apt-get -y install apt-file
-apt-get -y install tree
-apt-get -y install tmux
-apt-get -y install xclip
-apt-get -y install fzf
-apt-get -y install ripgrep
-apt-get -y install xsel
-apt-get -y install neofetch
-apt-get -y install sshpass
-apt-get -y install moreutils
-apt-get -y install git
-apt-get -y install gnutls-bin
-apt-get -y install tig
-apt-get -y install grc
-apt-get -y install gawk
-apt-get -y install gitk
-apt-get -y install zsync
-apt-get -y install jq
-apt-get -y install pv
-apt-get -y install rar
-#apt-get -y install kpartx
-apt-get -y install inxi
-apt-get -y --force-yes install xmlstarlet
-apt-get -y install hexedit
-#apt-get -y install wicd-curses
-apt-get -y install htop
-apt-get -y install iotop
-apt-get -y install sysstat
-apt-get -y install mpv
-apt-get -y install netcat
-apt-get -y install socat
-apt-get -y install youtube-dl
-apt-get -y install tor
-apt-get -y install torsocks
-apt-get -y install cmus
-#apt-get -y install scdl # build from git or pip install
-#apt-get -y install checkinstall
-apt-get -y install ntp ntpdate
-apt-get -y install nmap
-apt-get -y install gstreamer1.0-plugins-ugly gstreamer1.0-plugins-good gstreamer1.0-libav
+apt install -y software-properties-common apt-transport-https wget curl lvm2
+apt install -y apt-file
+apt install -y tree
+apt install -y tmux
+apt install -y xclip
+apt install -y fzf
+apt install -y ripgrep
+apt install -y xsel
+apt install -y neofetch
+apt install -y sshpass
+apt install -y moreutils
+apt install -y git
+apt install -y gnutls-bin
+apt install -y tig
+apt install -y grc
+apt install -y gawk
+apt install -y gitk
+apt install -y zsync
+apt install -y jq
+apt install -y pv
+apt install -y rar
+#apt install -y kpartx
+apt install -y inxi
+apt --force-yes install -y xmlstarlet
+apt install -y hexedit
+#apt install -y wicd-curses
+apt install -y htop
+apt install -y iotop
+apt install -y sysstat
+apt install -y mpv
+apt install -y netcat
+apt install -y ethtool
+apt install -y socat
+apt install -y youtube-dl
+apt install -y tor
+apt install -y torsocks
+apt install -y cmus
+#apt install -y scdl # build from git or pip install -y
+#apt install -y checkinstall -y
+apt install -y ntp ntpdate
+apt install -y nmap
+apt install -y gstreamer1.0-plugins-ugly gstreamer1.0-plugins-good gstreamer1.0-libav
 
-apt-get -y install cuetools
-apt-get -y install flac
-apt-get -y install vorbis-tools
-apt-get -y install sox
-apt-get -y install wavpack
-apt-get -y install shntool
-apt-get -y install lltag
+apt install -y cuetools
+apt install -y flac
+apt install -y vorbis-tools
+apt install -y sox
+apt install -y wavpack
+apt install -y shntool
+apt install -y lltag
 
-apt-get -y install firmware-iwlwifi #For thinkpad wifi: Intel 5100 AGN [Shiloh] 
-#apt-get -y install grub-pc grub2 gpart cgpt
-apt-get -y install flex bison
-apt-get -y install rsync
-apt-get -y install socat
+apt install -y firmware-iwlwifi #For thinkpad wifi: Intel 5100 AGN [Shiloh] 
+#apt install -y grub-pc grub2 gpart cgpt
+apt install -y flex bison
+apt install -y rsync
+apt install -y socat
 
-apt-get -y install rox-filer
-apt-get -y install atril 
-apt-get -y install pandoc
-#apt-get -y install libreoffice-pdfimport 
-apt-get -y install terminology
-apt-get -y install geeqie
-apt-get -y install vbindiff
-apt-get -y install wxhexeditor
-apt-get -y install lshw
+apt install -y rox-filer
+apt install -y atril 
+apt install -y pandoc
+#apt install -y libreoffice-pdfimport 
+apt install -y terminology
+apt install -y geeqie
+apt install -y vbindiff
+apt install -y wxhexeditor
+apt install -y lshw
 

010_broadcom-sta_wl.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # Provides the wl drive for broadcom BCM43xx wireless network cards see:
 # https://wiki.debian.org/wl
-apt-get install broadcom-sta-dkms
+apt install -y broadcom-sta-dkms

010_entropy-rgn-tools_haveged.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y rng-tools haveged
+apt install -y rng-tools haveged
 
 #/etc/default/rng-tools
 

010_eudev.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 # to remove you need to specify the version of libudev1 to downgrade
 # apt-cache policy libudev1
-# apt-get install udev libudev1=232-25+deb9u1
+# apt install -y udev libudev1=232-25+deb9u1
 ln -s /etc/apt/sources.list-available/devuan_experimental.list /etc/apt/sources.list.d/devuan_experimental.list
-apt-get update
-apt-get policy eudev
-apt-get -t experimental install eudev
+apt update
+apt policy eudev
+apt -t experimental install -y eudev
 
 rm /etc/apt/sources.list.d/devuan_experimental.list
-apt-get update
+apt update

010_hddtemp.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y hddtemp
+apt install -y hddtemp
 
 # RUN_DAEMON="false"
 sed -i 's,^\(RUN_DAEMON=\).*,\1'\"true\"',' /etc/default/hddtemp

010_liquorix-kernel.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # https://liquorix.net
-apt-get install -y apt-transport-https
+apt install -y apt-transport-https
 
 #codename="$(find /etc/apt -type f -name '*.list' | xargs grep -E '^deb' | awk '{print $3}' | grep -Eo '^[a-z]+' | sort | uniq -c | sort -n | tail -n1 | grep -Eo '[a-z]+$')"
 
@@ -35,8 +35,8 @@ ln -sf /etc/apt/sources.list-available/liquorix.list /etc/apt/sources.list.d/liq
 
 curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add 
 
-apt-get update
+apt update
 
-apt-get install linux-image-liquorix-amd64 linux-headers-liquorix-amd64
+apt install -y linux-image-liquorix-amd64 linux-headers-liquorix-amd64
 
 

010_nosh.sh

@@ -9,19 +9,19 @@ ln -s /etc/apt/sources.list-available/nosh.list  /etc/apt/sources.list.d/nosh.li
 curl "https://JdeBP.EU./Repository/debian/repository_signing_key.pub" > /usr/share/keyrings/jdebp-debian-repository.gpg
 
 
-apt-get update
+apt update
 
 ## https://jdebp.eu/Softwares/nosh/debian-binary-packages.html
 # Documentation
-apt-get install -y nosh-guide
+apt install -y nosh-guide
 
-apt-get install -y \
+apt install -y \
 	nosh-exec \
 	nosh-service-management \
 	nosh-terminal-management \
 	nosh-systemv-shims
 
-apt-get install -y \
+apt install -y \
 	nosh-run-system-manager \
 	nosh-run-local-syslog \
 	nosh-run-klog \
@@ -34,63 +34,63 @@ redo -C /etc/system-control/convert/ all
 ## Toolsets
 
 ## (exec, nosh, and the chain-loading utilities)
-#apt-get install -y nosh-exec
+#apt install -y nosh-exec
 
 ## (system-manager, service-manager, system-control, service-control and related utilities)
-#apt-get install -y nosh-service-management
+#apt install -y nosh-service-management
 
 ## (console-terminal-emulator, vc-get-tty, pty-get-tty, ttylogin-starter and related utilities)
-#apt-get install -y nosh-terminal-management
+#apt install -y nosh-terminal-management
 
 ## (ptybandage, ptyrun and related utilities)
-apt-get install -y nosh-terminal-extras
+apt install -y nosh-terminal-extras
 
 ## (tcpserver shim)
-apt-get install -y nosh-ucspi-tcp-shims
+apt install -y nosh-ucspi-tcp-shims
 
 ## (Z Shell completions for the toolsets)
-apt-get install -y nosh-zsh-completion
+apt install -y nosh-zsh-completion
 
 ## (systemd and servicectl shims for systemd compatibility)
-#apt-get install -y nosh-systemd-shims
+#apt install -y nosh-systemd-shims
 
 ## (halt, reboot, poweroff, telinit, chkconfig, and related shims for old-style System 5/BSD compatibility)
-apt-get install -y nosh-systemv-shims
+apt install -y nosh-systemv-shims
 
 ## (service shim for old-style System 5/BSD compatibility)
-apt-get install -y nosh-service-command-shim
+apt install -y nosh-service-command-shim
 
 ## (start, stop, initctl, and related shims for upstart compatibility)
-#apt-get install -y nosh-upstart-shims
+#apt install -y nosh-upstart-shims
 
 ## (invoke-rc.d and update-rc.d shims for Debian compatibility)
-apt-get install -y nosh-debian-shims
+apt install -y nosh-debian-shims
 
 ## (fasthalt, fastboot, and fastpoweroff shims for BSD compatibility)
-#apt-get install -y nosh-bsd-shims
+#apt install -y nosh-bsd-shims
 
 ## (rcctl and and related shims for OpenBSD compatibility)
-#apt-get install -y nosh-openbsd-shims
+#apt install -y nosh-openbsd-shims
 
 ## (utx and and related shims for FreeBSD compatibility)
-#apt-get install -y nosh-freebsd-shims
+#apt install -y nosh-freebsd-shims
 
 ## (resizecons, clear_console, and chvt shims for compatibility with the old kbd package)
-apt-get install -y nosh-kbd-shims
+apt install -y nosh-kbd-shims
 
 ## Service bundles 
-apt-get install -y nosh-bundles
+apt install -y nosh-bundles
 
 ## system-manager as process #1 (removes nosh-run-via-systemd)
-#apt-get install -y nosh-run-system-manager
+#apt install -y nosh-run-system-manager
 
 
 ## Base services
 # includes virecover and Debian cron.
-apt-get install -y nosh-run-debian-server-base
+apt install -y nosh-run-debian-server-base
 
 # CUPS, anacron, and Sun RPC.
-#apt-get install -y nosh-run-debian-desktop-base_1.37_amd64.deb
+#apt install -y nosh-run-debian-desktop-base_1.37_amd64.deb
 
 ## Change the Desktop Bus helper program
 ## Fix udev behaviour on non-systemd
@@ -122,38 +122,38 @@ sed -i -e s"|${SERVICE_HELPER_OLD}|${SERVICE_HELPER_NEW}|" ${DBUS_HOME}/system.c
 ## Plug and play device managers
 
 ## (vdev)
-#apt-get install nosh-run-vdev_1.37_amd64.deb (vdev)
+#apt install nosh-run-vdev_1.37_amd64.deb (vdev)
 
 ##    (systemd's udev)
-#apt-get install -y nosh-run-udev
+#apt install -y nosh-run-udev
 
 ##    (busybox mdev)
-#apt-get install nosh-run-busybox-mdev
+#apt install nosh-run-busybox-mdev
 
 ##    (suckless mdev)
-#apt-get install nosh-run-suckless-mdev
+#apt install nosh-run-suckless-mdev
 
 ## Virtual terminal services
 
 ## (old-style kernel virtual terminals)
-#apt-get install -y nosh-run-kernel-vt
+#apt install -y nosh-run-kernel-vt
 
 ## (a new-style application-mode virtual terminal)
-#apt-get install -y nosh-run-user-vt
+#apt install -y nosh-run-user-vt
 
 ## Freedesktop.org "kit" services
 # (Freedesktop.org "kit" services — packagekit, consolekit, policykit, NetworkManager, ModemManager et al.) 
-#apt-get install -y nosh-run-freedesktop-kits
+#apt install -y nosh-run-freedesktop-kits
 
 ## VirtualBox Guest Additions
-#apt-get install -y nosh-run-virtualbox-guest
+#apt install -y nosh-run-virtualbox-guest
 
 ## kernel log service
-#apt-get install -y nosh-run-klog
+#apt install -y nosh-run-klog
 
 ## local syslog() service
 # old-style logging service to programs that still use /dev/log. 
-#apt-get install -y nosh-run-local-syslog
+#apt install -y nosh-run-local-syslog
 
 # Index of ftp://repository.jdebp.info./debian/dists/stable/main/binary-amd64/
 # 

010_openrc.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # openrc uses sysvinit but from 0.2.5 can replace it. ascii version currently 0.2.3
-apt-get install sysvinit-core
-apt-get install util-linux sysvinit-utils 
-apt-get install initscripts openrc
+apt install -y sysvinit-core
+apt install -y util-linux sysvinit-utils 
+apt install -y initscripts openrc
 
 # Reboot when done
 for file in /etc/rc0.d/K*; do s=`basename $(readlink "$file")` ; /etc/init.d/$s stop; done

010_prelink.sh

@@ -5,7 +5,7 @@
 ## Revert everything:
 # prelink --all --undo
 
-apt-get install -y prelink
+apt install -y prelink
 
 ## File list
 # /etc/cron.daily/prelink

010_python.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-apt-get install -y python-dev python3-dev
-apt-get install -y python3-requests
-apt-get install -y python3-autopep8
-apt-get install -y python3-ipython
-apt-get install -y bpython
-apt-get install -y bpython3
-apt-get install -y python3-pylint
-apt-get install -y virtualenvwrapper
-#apt-get install -y prospector
+apt install -y python-dev python3-dev
+apt install -y python3-requests
+apt install -y python3-autopep8
+apt install -y python3-ipython
+apt install -y bpython
+apt install -y bpython3
+apt install -y python3-pylint
+apt install -y virtualenvwrapper
+#apt install -y prospector

010_saltstack.sh

@@ -57,7 +57,7 @@ echo "deb http://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/${SALT_VE
 #ln -s /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list /etc/apt/sources.list.d/saltstack-${DEBIAN_RELEASE}.list
 
 # Upgrade The System
-apt-get update && apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade -y
+apt update && apt -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade -y
 
 
 # salt-api 			- Generic, modular network access system
@@ -82,7 +82,7 @@ apt-get update && apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
 
 
 # Install Salt Dependencies
-apt-get install -y -o "DPkg::Options::=--force-confold" \
+apt install -y -o "DPkg::Options::=--force-confold" \
 	python \
 	apt-utils \
 	software-properties-common \
@@ -95,10 +95,10 @@ apt-get install -y -o "DPkg::Options::=--force-confold" \
 	python-jinja2 \
 	python-requests 
 
-apt-get -y install salt-minion
+apt install -y salt-minion
 
 # Salt-master
-apt-get install -yq -o -o "DPkg::Options::=--force-confold" --no-install-recommends \
+apt install -yq -o -o "DPkg::Options::=--force-confold" --no-install-recommends \
 	salt-master \
 	salt-api \
 	salt-ssh \
@@ -114,8 +114,8 @@ apt-get install -yq -o -o "DPkg::Options::=--force-confold" --no-install-recomme
 	make
 
 # Or get the development version
-# apt-get upgrade -y -o "DPkg::Options::=--force-confold" && \
-# apt-get install -y -o "DPkg::Options::=--force-confold" curl
+# apt upgrade -y -o "DPkg::Options::=--force-confold" && \
+# apt install -y -o "DPkg::Options::=--force-confold" curl
 # curl -L https://bootstrap.saltstack.com | sh -s -- -X git develop
 
 # salt-common in debian is missing zsh completions

010_unattended-upgrades.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#apt-get install -y unattended-upgrades apt-listchanges
+#apt install -y unattended-upgrades apt-listchanges
 
 # /etc/apt/apt.conf.d/50unattended-upgrades
 CONF_DIR=/etc/apt/apt.conf.d

010_vdev.sh

@@ -13,8 +13,8 @@
 ## /usr/share/vdev/vdev-install.sh udev | vdev
 
 ln -s /etc/apt/sources.list-available/devuan-experimental.list /etc/apt/sources.list.d/devuan-experimental.list
-apt-get update
-apt-get -t experimental install libudev1-compat vdevd vdev-initramfs
+apt update
+apt -t experimental install -y libudev1-compat vdevd vdev-initramfs
 
 rm /etc/apt/sources.list.d/devuan-experimental.list
-apt-get update
+apt update

010_zfs.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # All the zfs packages in debian stretch
-apt-get install -y dkms busybox-static
-apt-get install -y initramfs-tools dh-autoreconf
-apt-get install -y spl spl-dkms 
-apt-get install -y linux-headers-$(uname -r) zfs-dkms zfs-initramfs zfsutils-linux
-apt-get install -y zfs-zed
+apt install -y dkms busybox-static
+apt install -y initramfs-tools dh-autoreconf
+apt install -y spl spl-dkms 
+apt install -y linux-headers-$(uname -r) zfs-dkms zfs-initramfs zfsutils-linux
+apt install -y zfs-zed
 
 # linux default, mount partitions even if non-empty, the no option really only makes sense if the directory being mounted on has been declared as a mount point only and is therefore guaranteed to be empty.
 sed -i "s,^\(DO_OVERLAY_MOUNTS=\).*,\1\'yes\'," /etc/default/zfs

010_zram.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # https://www.kernel.org/doc/Documentation/blockdev/zram.txt
 
-apt-get install -y insserv
-apt-get install -y zram-tools  # Provides /etc/default/zramswap
+apt install -y insserv
+apt install -y zram-tools  # Provides /etc/default/zramswap
 
 CORES=1		# By default, zramswap-start will use all available cores.
 PERCENTAGE=10	# Specifies percentage of available RAM that should be used for zram

020_amprolla.sh

@@ -63,7 +63,7 @@
 #    },
 #}
 
-apt-get install gnupg2 python3-requests rsync
+apt install -y gnupg2 python3-requests rsync
 
 cd /usr/src/
 git clone https://github.com/parazyd/amprolla

020_arduino.sh

@@ -8,7 +8,7 @@ ARDUINO_TOOLS_DIR=${ARDUINO_TOOLS_DIR}
 ADD_URLS=
 
 mkdir "${ARDUINO_TOOLS_DIR}"
-sudo apt-get install gcc-arm-none-eabi openocd bsdtar
+sudo apt install -y gcc-arm-none-eabi openocd bsdtar
 
 cd /var/tmp || exit
 
@@ -18,7 +18,7 @@ wget -c https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz &
 	tar xf /var/tmp/arduino-${ARDUINO_VERSION}-linux64.tar.xz
 
 usermod -a -G dialout "${USER}" && \
-apt-get install git python-serial
+apt install -y git python-serial
 
 #https://raw.githubusercontent.com/espressif/arduino-esp32/master/package/package_esp32_index.template.json
 #http://arduino.esp8266.com/stable/package_esp8266com_index.json
@@ -124,9 +124,9 @@ ${ARDUINO_DIR}/arduino --install-boards micooke:nRF5
 #
 ## Fix the upload problem on Linux 64bit system
 #
-#sudo apt-get install lsb-core
+#sudo apt install -y lsb-core
 #
-#sudo apt-get install libudev1:i386
+#sudo apt install -y libudev1:i386
 #
 #sudo ln -sf /lib/x86_64-linux-gnu/libudev.so.1 /lib/x86_64-linux-gnu/libudev.so.0
 

020_audacity.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-apt-get install -y audacity
+apt install -y audacity

020_blender.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ascii version 2.78.a+dfsq0-4
 
-sudo apt-get -y install blender
+sudo apt install -y blender
 
 # Topology optimization with ToOptix
 # /usr/share/blender/scripts in in blender-data

020_bluez-alsa_dhmake.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
-sudo apt-get -y install \
+sudo apt install -y \
 	dh-autoreconf \
 	dh-make \
 	check \
@@ -8,7 +8,7 @@ sudo apt-get -y install \
 	bluetooth \
 	bluez-tools 
 
-sudo apt-get -y install \
+sudo apt install -y\
 	libbluetooth-dev \
 	libbsd-dev \
 	libusb-dev \
@@ -111,7 +111,7 @@ echo ${PACKAGE}_${VERSION}_amd64.deb
 sudo dpkg -i ../${PACKAGE}_${VERSION}_amd64.deb
 
 
-sudo apt-get -y install \
+sudo apt install-y \
 	libbluetooth-dev \
 	libbsd-dev \
 	libusb-dev \

020_bootchart.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y bootchart2 pybootchartgui
+apt install -y bootchart2 pybootchartgui
 
 sed -i 's|^GRUB_CMDLINE_LINUX="\(.*\)"|GRUB_CMDLINE_LINUX="\1 initcall_debug printk.time=y init=/sbin/bootchartd"|' /etc/default/grub
 

020_broot.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
-sudo apt-get -y install \
+#sudo apt install -y \
 
 
 USER="Canop"
@@ -16,11 +16,9 @@ VERSION=${VERSION:1} # strip the preceding 'v'
 DEBEMAIL="person@company.tld"
 DEBFULLNAME="Testy McTester"
 DESCRIPTION="Integration between BlueZ and ALSA."
-LONG_DESCRIPTION=" With BlueALSA one can achieve the same goal as with PulseAudio, but with fewer\n dependencies and less overhead. BlueALSA registers all known Bluetooth audio\n profiles in BlueZ, so in theory every Bluetooth audio device can be connected.\n In order to access the audio stream, one has to connect to the ALSA PCM device\n called bluealsa."
+LONG_DESCRIPTION=" Get an overview of a directory, even a big one"
+
 
-# Disable discoverable timeout in the main.conf from the bluez package
-sed -i 's,^\(DiscoverableTimeout = \).*,\1'\"0\"',' /etc/bluetooth/main.conf
-  
 # Make the BUILD_HOME directory and clone upstream
 mkdir -p ${BUILD_HOME}
 cd ${BUILD_HOME} || exit
@@ -62,8 +60,6 @@ echo ****************
 cat debian/control
 echo ****************
 
-BUILD_OPTIONS="--enable-aac --enable-ofono --enable-debug"
-
 cat <<EOF > debian/rules
 #!/usr/bin/make -f
 %:
@@ -85,88 +81,3 @@ echo ${PACKAGE}_${VERSION}_amd64.deb
 
 sudo dpkg -i ../${PACKAGE}_${VERSION}_amd64.deb
 
-#-------------------------------------------------------------------------------
-## When BlueALSA has been created, then you can start BlueALSA as background task:
-#bluealsa --disable-hfp &
-
-# Now - for using your bluetooth-speaker/headset - with BlueALSA you have to intoduce the device to the bluetooth-stack using bluetoothctl:
-# bluetoothctl >
-# scan on
-# [NEW] Device 30:23:23:F4:48:2C TH-S10U
-# scan off
-# pair 30:23:23:F4:48:2C
-# trust 30:23:23:F4:48:2C
-# exit
-
-# After that power off&on the bt-speaker device and the device will connect automatically as a trusted device.
-
-# Before we try our first audio-command we had to export one thing to make BlueALSA mor system-friendly:
-export LIBASOUND_THREAD_SAFE=0
-
-# autostart bluealsa
-#cat <<EOF > /etc/rc.local
-## Start bluealsa as root <https://github.com/Arkq/bluez-alsa>
-#export LIBASOUND_THREAD_SAFE=0
-#/usr/bin/bluealsa -S &
-#EOF
-
-# Text to speech:
-
-# espeak "Hello, how are you?" -w /home/guido/espeak.wav -s145
-# aplay -D bluealsa:HCI=hci0,DEV=30:23:23:F4:48:2C,PROFILE=a2dp /home/guido/espeak.wav
-
-# arecord -D bluealsa capture.wav
-
-# bluealsa-aplay XX:XX:XX:XX:XX:XX
-
-# $ aplay -D bluealsa:SRV=org.bluealsa,DEV=XX:XX:XX:XX:XX:XX,PROFILE=sco Bourree_in_E_minor.wav
-
-# amixer -D bluealsa sset '<control name>' 70%
-# amixer -D bluealsa sset 'Jabra MOVE v2.3.0 - A2DP' 50%
-
-
-# Internetradio:
-
-# mpg123 -a bluealsa:HCI=hci0,DEV=30:23:23:F4:48:2C,PROFILE=a2dp -@ /home/guido/ffh80s.pls
-
-# For shorting the command you could create a ~/.asoundrc with the following content:
-
-# defaults.bluealsa.interface "hci0"
-# defaults.bluealsa.device "30:23:23:F4:48:2C"
-# defaults.bluealsa.profile "a2dp"
-# defaults.bluealsa.delay 10000
-
-# Now you can the shorter version of the command:
-
-# mpg123 -a bluealsa -@ /home/guido/ffh80s.pls
-
-# For set the volume of such a device you have to know the "real" name of the device out of the bluetoothctl and the name of the used protocol:
-
-# Device: 30:23:23:F4:48:2C TH-S10U
-# Protocol: A2DP
-# amixer -D bluealsa sset 'TH-S10U - A2DP ' 70%
-
-#------------------------------------------------------------------------
-## ldacBT
-##
-## AOSP libldac dispatcher
-## https://android.googlesource.com/platform/external/libldac
-## https://github.com/EHfive/ldacBT
-
-#git clone https://github.com/EHfive/ldacBT.git
-#cd ldacBT
-#git submodule update --init
-#
-#mkdir build && cd build
-#cmake \
-#    -DCMAKE_INSTALL_PREFIX=/usr \
-#    -DINSTALL_LIBDIR=/usr/lib \
-#    -DLDAC_SOFT_FLOAT=OFF \
-#    ../
-#make DESTDIR=$DEST_DIR install
-
-#------------------------------------------------------------------------
-## [open]aptx - reverse-engineered apt-X
-## https://github.com/Arkq/openaptx
-
-#------------------------------------------------------------------------

020_bunsenlabs.sh

@@ -6,7 +6,7 @@ RELEASE=deuterium  # derived from Debian Jessie.
 RELEASE=helium     # derived from Debian Stretch
 DEBIAN_FRONTEND=noninteractive 
 
-apt-get install -y bunsen-keyring
+apt install -y bunsen-keyring
 
 #curl -s https://pkg.bunsenlabs.org/BunsenLabs-${RELEASE}.asc | \
 #	gpg --with-fingerprint -  | \
@@ -34,10 +34,10 @@ ln -s /etc/apt/sources.list-available/bunsen-stretch-backports.list /etc/apt/sou
 
 ln -s /etc/apt/sources.list-available/bunsen-other.list /etc/apt/sources.list.d/bunsen-other.list
 
-apt-get update
+apt update
 
 # These are the base packages for a bunsenized openbox system 
-#apt-get install -y \
+#apt install -y \
 # 	bunsen-os-release \
 # 	bunsen-thunar \
 # 	bunsen-welcome \

020_chrome-browser.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 wget -c --directory-prefix=/var/tmp https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 dpkg -i /var/tmp/google-chrome-stable_current_amd64.deb
-apt-get -f install
-apt-get autoremove
-apt-get clean
+apt -f install
+apt autoremove
+apt clean
 
 # The post install script does a few things that assume installing chrome means you want it as
 # the default browser and that it should auto update whenever it sees fit.

020_conky.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install conky conky-all curl jq ttf-ubuntu-font-family
+apt install -y conky conky-all curl jq ttf-ubuntu-font-family
 
 #USER=default
 USER=root
@@ -16,7 +16,7 @@ wget -qO- -O /var/tmp/aurora.tar.gz http://downloads.sourceforge.net/project/aur
 #git clone https://github.com/maxiwell/conky-seamod
 #git clone https://github.com/zagortenay333/Harmattan
 
-apt-get install -y lm-sensors hddtemp dmidecode
+apt install -y lm-sensors hddtemp dmidecode
 
 chmod u+s /usr/sbin/hddtemp
 chmod u+s /usr/sbin/dmidecode
@@ -35,11 +35,11 @@ cp ./fonts/* ${DEST}/.conky/fonts
 #service kmod restart
 
 #echo "building conky-manager2" 
-#apt-get install -y p7zip-full rsync imagemagick
+#apt install -y p7zip-full rsync imagemagick
 #cd /var/tmp
 #
 ## build deps
-#apt-get install -y autotools-dev devscripts debhelper valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev
+#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
 #cd conky-manager2
 #
@@ -49,11 +49,11 @@ cp ./fonts/* ${DEST}/.conky/fonts
 #dch -R 
 #dpkg-buildpackage -us -uc -b
 #dpkg -i ../conky-manager_*deb
-#apt-get -f install
+#apt -f install
 #
 ## Remove build deps
-#apt-get remove -y autotools-dev valac debhelper libgtk-3-dev libgee-0.8-dev libjson-glib-dev
-#apt-get -y autoremove
+#apt remove -y autotools-dev valac debhelper libgtk-3-dev libgee-0.8-dev libjson-glib-dev
+#apt -y autoremove
 
 # Run conky + theme on x startup. Points at the symlink in dotconky changed by theme
 mkdir -p ${DEST}/.xinitrc.d/

020_console.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+apt install -y console-setup
 # dpkg-reconfigure console-setup
 
 # Original settings

020_deprecated-sysv-utils.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-apt-get install -y sysv-rc-conf
-apt-get install -y chkconfig
+apt install -y sysv-rc-conf
+apt install -y chkconfig

020_devuan_arm-sdk.sh

@@ -4,7 +4,7 @@ mkdir devuan_arm-sdk && cd devuan_arm-sdk
 git clone https://github.com/parazyd/arm-sdk
 
 
-apt-get install 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
+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
 
 
 cd arm-sdk

020_dissenter-browser.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-apt-get install -y fonts-liberation libappindicator3-1 libdbusmenu-glib4 libdbusmenu-gtk3-4 libindicator3-7
+apt install -y fonts-liberation libappindicator3-1 libdbusmenu-glib4 libdbusmenu-gtk3-4 libindicator3-7
 
-apt-get install -y dpkg-dev fakeroot lintian apt-utils deb-pkg-tools
+apt install -y dpkg-dev fakeroot lintian apt-utils deb-pkg-tools
 
 # FIXME: change the xpaths to relative paths to the labe
 #!/bin/env python3
@@ -31,4 +31,4 @@ wget -O "$TEMP_DEB" "${LINK}"
 sudo dpkg -i "${TEMP_DEB}"
 rm -f "${TEMP_DEB}"
 
-apt-get -f install
+apt -f install

020_djmount.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y djmount
+apt install -y djmount
 
 DEST=/etc/skel
 DJMOUNT_DIR=${DEST}/dlna

020_docker.sh

@@ -23,17 +23,17 @@ else
 		echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
 fi
 
-apt-get update
-apt-get -y install --force-yes jq
-apt-get remove -y docker docker-engine docker.io containerd runc
-apt-get install -y \
+apt update
+apt install -y --force-yes jq
+apt remove -y docker docker-engine docker.io containerd runc
+apt install -y \
     apt-transport-https \
     ca-certificates \
     curl \
     gnupg2 \
     software-properties-common
-apt-get install -y docker-ce docker-ce-cli containerd.io
-#apt-get install -y --force-yes docker-engine=1.9.1-0~jessie
+apt install -y docker-ce docker-ce-cli containerd.io
+#apt install -y --force-yes docker-engine=1.9.1-0~jessie
 
 #mkdir -p /var/lib/docker
 #umount /dev/mapper/vg_prime-varLibDockerLV 

020_epson-driver.sh

@@ -2,11 +2,11 @@
 # https://www.openprinting.org/driver/epson-201106w/
 DRIVER_VERSION=1.0.1-1lsb3.2
 
-apt-get -y install lsb
+apt install -y lsb
 
 
 wget -c --directory-prefix /var/tmp http://download.ebz.epson.net/dsc/op/stable/debian/dists/lsb3.2/main/binary-amd64/epson-inkjet-printer-201106w_${DRIVER_VERSION}_amd64.deb
 
 dpkg -i /var/tmp/epson-inkjet-printer-201106w_${DRIVER_VERSION}_amd64.deb
 
-apt-get -f install
+apt -f install

020_etcher.sh

@@ -9,7 +9,7 @@ sudo ln -s ${AVAILABLE}/etcher.list ${ACTIVE}/etcher.list
 
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61
 
-sudo apt-get update
-sudo apt-get install balena-etcher-electron
+sudo apt update
+sudo apt install -y balena-etcher-electron
 
-apt-get clean
+apt clean

020_etckeeper.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-apt-get install -y etckeeper git openssh-client
+# FIXME: provide gitlab token to allow pushes
+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
@@ -16,7 +17,7 @@ apt-get install -y etckeeper git openssh-client
 cat /dev/zero | ssh-keygen -b 2048 -t rsa -q -N ""
 
 PROJECT_NAME=$(uname -n)_etc  # myproject
-GITLAB_SERVER="http://example.com"
+GITLAB_SERVER="http://git.ring-zero.co.uk"
 PROJECT_URL="${GITLAB_SERVER}/api/v3/projects"
 KEYS_URL="${GITLAB_SERVER}/api/v3/user/keys"
 PRIVATE_TOKEN=QVy1PB7sTxfy4pqfZM1U

020_firmware.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-apt-get install linux-firmware
-apt-get install firmware-linux
-apt-get install firmware-linux-free
-apt-get install firmware-linux-nonfree
-apt-get install firmware-misc-nonfree
+apt install -y linux-firmware
+apt install -y firmware-linux
+apt install -y firmware-linux-free
+apt install -y firmware-linux-nonfree
+apt install -y firmware-misc-nonfree

020_fish.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Install fish
-apt-get install -y fish 
+apt install -y fish 
 mkdir -p ~/.config/fish
 # wget -c --directory-prefix ~/.config/fish https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/fish/config.fish 
 
@@ -16,22 +16,22 @@ function fish_prompt
 end
 
 function inst
-  sudo apt-get update
-  sudo apt-get install $argv
+  sudo apt update
+  sudo apt install $argv
 end
 
 function update
-  sudo apt-get update
+  sudo apt update
 end
 
 function upgrade
-  sudo apt-get update
-  sudo apt-get upgrade
+  sudo apt update
+  sudo apt upgrade
 end
 
 function updateall
-  sudo apt-get update
-  sudo apt-get upgrade
+  sudo apt update
+  sudo apt upgrade
   vim +BundleUpdate
 end
 

020_fmui.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 cd /var/tmp
 
-apt-get install -y toilet fzf mpc vis ffmpeg 
+apt install -y toilet fzf mpc vis ffmpeg 
 
 # pip3 install --user fmui
 

020_free42.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # build from unstable source - below
-#apt-get -y install free42-nologo
-apt-get -y install xxd
+#apt install -y free42-nologo
+apt install -y xxd
 
 DEST=/etc/skel
 
@@ -334,8 +334,8 @@ apt install devscripts
 mk-build-deps free42-nologo --install --root-cmd sudo --remove
 
 echo "deb-src http://pkgmaster.devuan.org/merged/ ceres main contrib non-free" >> /etc/apt/sources.list.d/ceres-temp.list
-apt-get source free42-nologo
-apt-get update
+apt source free42-nologo
+apt update
 rm /etc/apt/sources.list.d/ceres-temp.list
 
 cd free42-nologo

020_free42_from_dsc.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install xxd
+apt install -y xxd
 
 WORKDIR="/var/tmp"
 DSC_FILE="http://deb.debian.org/debian/pool/main/f/free42-nologo/free42-nologo_1.4.77-1.2.dsc"

020_freecad.sh

@@ -3,13 +3,13 @@
 # debian is still on 0.16 but 0.17 is needed for current workbenches
 
 # If building, use cmake gui for configuring the build.
-sudo apt-get install -y cmake-qt-gui python-numpy python3-numpy z88
+sudo apt install -y cmake-qt-gui python-numpy python3-numpy z88
 
 # the ppa has calculix-ccx eigen3 freecad-daily (0.18~beta1) opencascade
 # ppa:freecad-maintainers/freecad-daily
 
 # sudo add-apt-repository ppa:freecad-maintainers/freecad-daily
-# sudo apt-get update
+# sudo apt update
  YOUR_UBUNTU_VERSION_HERE=bionic # 18.04 buster/sid
 # YOUR_UBUNTU_VERSION_HERE=artful # 17.10 stretch/sid
 # YOUR_UBUNTU_VERSION_HERE=xenial # 16.04 stretch/sid
@@ -42,7 +42,7 @@ deb-src http://ppa.launchpad.net/elmer-csc-ubuntu/elmer-csc-ppa/ubuntu $YOUR_UBU
 EOF
 sudo ln -sf /etc/apt/sources.list-available/elmer.list /etc/apt/sources.list.d/elmer.list
 
-sudo apt-get update
+sudo apt update
 
 ## freecad
 # Signing key: 1024R/83193AA3B52FF6FCF10A1BBF005EAE8119BB5BCA (What is this?) 
@@ -55,14 +55,14 @@ sudo apt-get update
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 19BB5BCA
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9FB7E178
 
-sudo apt-get install -y freecad calculix-ccx elmerfem-csc
+sudo apt install -y freecad calculix-ccx elmerfem-csc
 
 #sudo ln -s /etc/apt/sources.list-available/devuan-ceres.list /etc/apt/sources.list.d/devuan-ceres.list
-#sudo apt-get update
-#sudo apt-get install -y -t unstable netgen
+#sudo apt update
+#sudo apt install -y -t unstable netgen
 
 cd /usr/src
-#sudo apt-get source netgen
+#sudo apt source netgen
 #http://http.debian.net/debian/pool/main/n/netgen/netgen_4.9.13.dfsg-11.dsc
 #http://http.debian.net/debian/pool/main/n/netgen/netgen_4.9.13.dfsg.orig.tar.gz
 #http://http.debian.net/debian/pool/main/n/netgen/netgen_4.9.13.dfsg-11.debian.tar.xz
@@ -86,8 +86,8 @@ sudo gbp buildpackage --git-pbuilder --git-arch=amd64 --git-dist=ascii --git-ign
 #netgen-doc_4.9.13.dfsg-11_all.deb
 #netgen-headers_4.9.13.dfsg-11_amd64.deb
 
-# The would be installed by apt-get install -f later but let be explicite.
-sudo apt-get install \
+# The would be installed by apt install -f later but let be explicite.
+sudo apt install \
   tix \
   liboce-ocaf-lite10 \
   liboce-ocaf10 \
@@ -97,9 +97,9 @@ sudo apt-get install \
 
 sudo dpkg -i ../libnglib-4.9.13_4.9.13.dfsg-11_amd64.deb &&  dpkg -i ../netgen_4.9.13.dfsg-11_amd64.deb
 
-sudo apt-get -y install -f
+sudo apt install -y -f
 
-#sudo rm /etc/apt/sources.list.d/devuan-ceres.list && apt-get update
+#sudo rm /etc/apt/sources.list.d/devuan-ceres.list && apt update
 
 # opencascade in experimental
 # https://ftp-master.debian.org/new/opencascade_7.2.0+dfsg1-1.html
@@ -127,5 +127,5 @@ wget -c https://datapacket.dl.sourceforge.net/project/cfmesh-cfdof/cfmesh-cfdof.
 # Available as addon in freecad interface
 # https://github.com/jaheyns/CfdFoam
 
-sudo apt-get install -y python-gmsh gmsh
-sudo apt-get install -y gnuplot paraview openfoam
+sudo apt install -y python-gmsh gmsh
+sudo apt install -y gnuplot paraview openfoam

020_git-cola.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-apt-get -y install git-cola
-apt-get -y install meld 
+apt install -y git-cola
+apt install -y meld 

020_git-lfs.sh

@@ -41,10 +41,10 @@ echo -n "Importing packagecloud gpg key... "
   curl -L "${gpg_key_url}" 2> /dev/null | apt-key add - &>/dev/null
 echo "done."
 
-apt-get update
+apt update
 
-apt-get install -y git-lfs
-apt-get -f install -y
+apt install -y git-lfs
+apt install -y -f
 
 
 echo "See: http://github.com/git-lfs/git-lfs/wiki/Tutorial"

020_git-mergetool.sh

@@ -2,7 +2,7 @@
 BIN_DIR=/usr/local/bin
 #BIN_DIR=~/bin
 
-apt-get -y install meld
+apt install -y meld
 
 # Available tools:
 git difftool --tool-help

020_gitlab-runner.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-apt-get install -y curl apt-transport-https gnupg 
+apt install -y curl apt-transport-https gnupg 
 
 OS=debian
 DIST=stretch
@@ -23,6 +23,6 @@ ln -s /etc/apt/sources.list-available/runner_gitlab-runner.list /etc/apt/sources
 
 curl -L "${GPG_KEY_URL}" 2> /dev/null | apt-key add - &>/dev/null
 
-apt-get update
+apt update
 
-apt-get install -y gitlab-runner
+apt install -y gitlab-runner

020_grc.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install grc
+apt install -y grc
 
 DEST=/etc/skel
 ALIAS_HOME=${DEST}/.zsh_aliases.d/

020_hexchat.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install hexchat
+apt install -y hexchat
 
 #HEXCHAT_HOME=$HOME/.config/hexchat
 HEXCHAT_HOME=/etc/skel/.config/hexchat

020_jack.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-apt-get -y install multimedia-jack
-apt-get -y install patchage
+apt install -y multimedia-jack
+apt install -y patchage
 
-apt-get -y install cadence
-apt-get -y install catia
-apt-get -y install claudia
+apt install -y cadence
+apt install -y catia
+apt install -y claudia

020_jitsi.sh

@@ -25,22 +25,22 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C697D823EB0AB654
 
 # Update your package list:
 
-apt-get -y update
+apt update
 
 # Install the full suite:
 
-apt-get -y install jitsi-meet
+apt install -y jitsi-meet
 
 # or only the packages you need like for example:
 
-#apt-get install -y jicofo
-#apt-get install -y jigasi
-#apt-get install -y jitsi
-#apt-get install -y jitsi-archive-keyring
-#apt-get install -y jitsi-meet
-#apt-get install -y jitsi-meet-prosody
-#apt-get install -y jitsi-meet-tokens
-#apt-get install -y jitsi-meet-web
-#apt-get install -y jitsi-meet-web-config
-#apt-get install -y jitsi-videobridge
+#apt install -y jicofo
+#apt install -y jigasi
+#apt install -y jitsi
+#apt install -y jitsi-archive-keyring
+#apt install -y jitsi-meet
+#apt install -y jitsi-meet-prosody
+#apt install -y jitsi-meet-tokens
+#apt install -y jitsi-meet-web
+#apt install -y jitsi-meet-web-config
+#apt install -y jitsi-videobridge
 

020_jq.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
-sudo apt-get -y install \
+sudo apt install -y \
 	jq \
 	dh-make \
 	debhelper \

020_keepass.sh

@@ -7,4 +7,4 @@ DOWNLOAD_DIR=/tmp
 
 wget -c --directory-prefix "${DOWNLOAD_DIR}" https://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-get -y -f install
+sudo apt -y -f install

020_kodi_nightly_ppa.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# sudo apt-get install kodi
+# sudo apt install -y kodi
 
 # 18.04  bionic     buster
 # 17.10  artful     stretch
@@ -13,7 +13,7 @@ sudo ln -sf /etc/apt/sources.list-available/kodi_nightly-ppa.list /etc/apt/sourc
 
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6D975C4791E7EE5E
 
-sudo apt-get update
+sudo apt update
 
 # Plugins
 #covenant
@@ -62,5 +62,5 @@ packages_missing="                                           \
     kodi-pvr-vbox                                            \
     kodi-pvr-zattoo"              
                            
-sudo apt-get update                                        && \
-sudo apt-get install -y --no-install-recommends $packages 
+sudo apt update                                        && \
+sudo apt install -y --no-install-recommends $packages 

020_kodi_ppa.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# sudo apt-get install kodi
+# sudo apt install -y kodi
 
 # 18.04  bionic     buster
 # 17.10  artful     stretch
@@ -13,7 +13,7 @@ sudo ln -sf /etc/apt/sources.list-available/kodi-ppa.list /etc/apt/sources.list.
 
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6D975C4791E7EE5E
 
-sudo apt-get update
+sudo apt update
 
 # Plugins
 #covenant
@@ -64,7 +64,7 @@ packages_missing="                                           \
     kodi-pvr-vbox                                            \
     kodi-pvr-zattoo" 
 
-sudo apt-get update                                        && \
-sudo apt-get install -y --no-install-recommends $packages 
-sudo apt-get install -y --no-install-recommends $packages_missing
-sudo apt-get install -y --no-install-recommends 
+sudo apt update                                        && \
+sudo apt install -y --no-install-recommends $packages 
+sudo apt install -y --no-install-recommends $packages_missing
+sudo apt install -y --no-install-recommends 

020_lsd.sh

@@ -7,7 +7,7 @@ RELEASE=$(curl -s https://api.github.com/repos/${PROJECT}/releases/latest | grep
 wget -c -P ${PREFIX} https://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb 
 
 dpkg -i ${PREFIX}/${NAME}_${RELEASE}_amd64.deb 
-apt-get -f install
+apt -f install
 
 # Aliases
 #FLAGS

020_lxc.sh

@@ -3,7 +3,7 @@
 # in favor of lxcfs on older kernels or the kernels CGroup Namespace on newer, expect lxcfs to go 
 # the same way as cgmanager, just use newer kernels.
 
-apt-get install lxc lxcfs dnsmasq
+apt install -y lxc lxcfs dnsmasq
 
 # lxc-net configuration sourced from /usr/lib/x86_64-linux-gnu/lxc/lxc-net which contains the default values which means your bridge will be given a subnet of 10.0.3.0.
 
@@ -64,7 +64,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 #those in alphabetical order.
 
 # Needed for live migrate
-apt-get install criu
+apt install -y criu
 
 ## then you can:
 # lxc launch ubuntu $somename

020_lxd.sh

@@ -11,18 +11,18 @@ sudo apt install acl dnsmasq-base git golang liblxc1 lxcfs lxc-dev python-pylxd
 #=============================================================================
 # golang deps
 #golang-any-shared-dev use: 
-apt-get install golang-any # or similar
+apt install -y golang-any # or similar
 
 # golang-yaml.v2-dev transitional for 
-apt-get install golang-gopkg-yaml.v2-dev
+apt install -y golang-gopkg-yaml.v2-dev
 
 #golang-websocket-dev transitional for 
-apt-get install golang-github-gorilla-websocket-dev
+apt install -y golang-github-gorilla-websocket-dev
 
 # golang-go.crypto-dev transitional package for: 
-apt-get install golang-golang-x-crypto-dev
+apt install -y golang-golang-x-crypto-dev
 
-apt-get install \
+apt install -y \
 	golang-petname-dev \
 	golang-context-dev \
 	golang-github-gorilla-mux-dev \
@@ -41,7 +41,7 @@ apt-get install \
 # golang-gopkg-lxc-go-lxc.v2-dev
 
 # build deps:
-apt-get install \
+apt install -y \
 	dh-golang \
        	golang-go\
 	lxc-dev\
@@ -52,7 +52,7 @@ apt-get install \
 
 git clone https://anonscm.debian.org/cgit/pkg-go/packages/golang-gopkg-lxc-go-lxc.v2.git
 cd ./golang-gopkg-lxc-go-lxc.v2
-apt-get install cowbuilder dh-golang
+apt install -y cowbuilder dh-golang
 
 DIST=$(lsb_release --short --codename)
 ARCH=$(dpkg --print-architecture)
@@ -67,7 +67,7 @@ cp golang-gopkg-lxc-go-lxc.v2-dev_*_all.deb /srv/pbuilder/deps/
 #=============================================================================
 # LXD
 # Build-Depends: 
-apt-get install \
+apt install -y \
 	debhelper \
 	dh-apparmor \
 	dh-golang \

020_lxdm-xfce4.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-apt-get install -y lxdm && apt-get -y remove lxlock xscreensaver xscreensaver-data
+apt install -y lxdm && apt remove -y lxlock xscreensaver xscreensaver-data
 sed -i '/^# session=.*/ s/.*/&\nsession=\/usr\/bin\/startxfce4/' /etc/lxdm/lxdm.conf
 

020_matrix-synapse-server.sh

@@ -11,6 +11,6 @@ sudo ln -s /etc/apt/sources.list-available/matrix-synapse.list /etc/apt/sources.
 # Add the public key:
 curl -L https://packages.matrix.org/debian/matrix-org-archive-keyring.asc | sudo apt-key add - 
 
-sudo apt-get update && apt-get -y install matrix-synapse-py3
+sudo apt update && apt install -y matrix-synapse-py3
 
 

020_meld.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y meld
+apt install -y meld
 
 dbus-launch --exit-with-session gsettings set org.gnome.meld style-scheme 'meld-dark'
 dbus-launch --exit-with-session gsettings set org.gnome.meld wrap-mode 'word'

020_mkusb.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# sudo apt-get install kodi
+# sudo apt install -y kodi
 
 # 18.04  bionic     buster
 # 17.10  artful     stretch
@@ -34,6 +34,6 @@ fi
 
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 54B8C8AC
 
-sudo apt-get update
+sudo apt update
 
-sudo apt-get install -y --no-install-recommends $packages 
+sudo apt install -y --no-install-recommends $packages 

020_molly-guard.sh

@@ -8,7 +8,7 @@
 #
 # Before molly-guard invokes the real command, all scripts in /etc/molly-guard/run.d/ have to run and exit successfully; else, it aborts the command.
 
-apt-get install -y molly-guard
+apt install -y molly-guard
 
 # sudo and tmux stop detection of the SSH session. (It also affects screen the same way - this is a known issue listed in man molly-guard.)
 cat > /etc/sudoers.d/molly-guard << EOF

020_mps-youtube.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install mps-youtube youtube-dl python3-pafy python3-pyperclip ffmpeg avconv mpv
+apt install -y mps-youtube youtube-dl python3-pafy python3-pyperclip ffmpeg avconv mpv
 
 # Change transcoding settings here:
 # $HOME/.config/mps-youtube/transcode

020_mpv.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install mpv
+apt install -y mpv
 
 mkdir -p ~/.config/mpv
 

020_mutt-khard.sh

@@ -1,6 +1,6 @@
 #FIXME: Install khard contacts support in mutt NOT TESTED YET
 
-apt-get install -y khard
+apt install -y khard
 
 
 # khard integration

020_mutt-notmuch-afew.sh

@@ -6,7 +6,7 @@
 #FIXME: NOT TESTED YET needs notmuch-mutt installed first
 #FIXME: add afew tagging: https://readthedocs.org/projects/afew/downloads/pdf/latest/
 
-apt-get install -y afew # provides /usr/bin/afew
+apt install -y afew # provides /usr/bin/afew
 
 
 mkdir -p /etc/skel/.config/afew/

020_mutt-notmuch.sh

@@ -5,7 +5,7 @@
 #macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>read -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 
 
-apt-get install -y notmuch-mutt
+apt install -y notmuch-mutt
 
 
 NEOMUTTCONF="/etc/skel/.config/mutt/"

020_mutt-wizard.sh

@@ -47,7 +47,7 @@ set -e
 
 
 #set -x
-apt-get install -y git neomutt urlscan w3m w3m-img ripmime isync msmtp vdirsyncer pass mailsync libnotify-bin lynx urlview
+apt install -y git neomutt urlscan w3m w3m-img ripmime isync msmtp vdirsyncer pass mailsync libnotify-bin lynx urlview
 
 
 # Shared variables for the heredocs

020_nanorc.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-apt-get install -y nano 
-#apt-get install -y checkinstall
+apt install -y nano 
+#apt install -y checkinstall
 
 
 LATEST_URL=https://github.com/scopatz/nanorc.git

020_neofetch_motd.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #!/bin/bash
-apt-get install -y neofetch
+apt install -y neofetch
 
 mkdir -p /etc/update-motd.d
 cat > /etc/update-motd.d/20neofetch <<EOF

020_neovim.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # Install Neovim
-apt-get install -y software-properties-common
-apt-get install -y neovim 
+apt install -y software-properties-common
+apt install -y neovim 
 
 # Need to backport from sid
-apt-get install -y #python-neovim python3-neovim
+apt install -y #python-neovim python3-neovim
 
 # python-neovim if notavailableasapackage
 #pip2 install --user --upgrade neovim

020_nethogs.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-apt-get install nethogs
+apt install -y nethogs
 setcap "cap_net_admin,cap_net_raw+pe" /usr/sbin/nethogs

020_nodejs.sh

@@ -13,7 +13,7 @@ echo "deb-src https://deb.nodesource.com/$VERSION $DISTRO main" | sudo tee -a ${
 ln -sf ${AVAILABLE}/nodesource.list /etc/apt/sources.list.d/nodesource.list
 
 
-sudo apt-get update
-apt-get install -y nodejs
+sudo apt update
+apt install -y nodejs
 
 #sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10

020_nvidia_cuda.sh

@@ -24,11 +24,11 @@ http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1704/x86_64/
 #ln -s /etc/apt/sources.list-available/cuda.list /etc/apt/sources.list.d/cuda.list
 #
 #sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1704/x86_64/7fa2af80.pub
-#sudo apt-get update
-#sudo apt-get install cuda
+#sudo apt update
+#sudo apt install -y cuda
 
 # debian
-apt-get install \
+apt install -y \
 	nvidia-cuda-toolkit \
 	nvidia-cuda-mps \
 	nvidia-visual-profiler \

020_obsproject.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo apt-get install obs-studio ffmpeg
+sudo apt install -y obs-studio ffmpeg

020_onivim.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install jq
+apt install -y jq
 
 set -x
 PROJECT=onivim/oni

020_onivim2.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install jq
+apt install -y jq
 
 set -x
 PROJECT=onivim/oni2

020_pbuilder.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install -y cowbuilder dh-golang ccache
+apt install -y cowbuilder dh-golang ccache
 
 DIST=ascii
 DIST=$(lsb_release --short --codename)
@@ -164,7 +164,7 @@ cat > ${HOOK_DIR}/D05deps << 'EOF'
 #!/bin/bash
 echo "deb [trusted=yes] file:///srv/pbuilder/deps ./" > /etc/apt/sources.list.d/local.list
 (cd /srv/pbuilder/deps; apt-ftparchive packages . > Packages)
-apt-get update
+apt update
 EOF
 
 chmod +x ${HOOK_DIR}/D05deps
@@ -176,7 +176,7 @@ LOCAL_REPO="/var/cache/pbuilder/result"
 #!/bin/bash
 echo "deb [trusted=yes] file://${LOCAL_REPO} ./" > /etc/apt/sources.list.d/pbuild-local.list
 (cd ${LOCAL_REPO}; apt-ftparchive packages . > Packages)
-apt-get update
+apt update
 EOF
 
 chmod +x ${HOOK_DIR}/D06deps

020_pidgin.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-apt-get install -y pidgin pidgin-otr
+apt install -y pidgin pidgin-otr

020_platformio-core.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # http://docs.platformio.org/en/latest/faq.html#faq-install-shell-commands
 
-sudo apt-get install python python-pip checkinstall
+apt install -f python python-pip checkinstall
 
 # sudo python -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)"
 

020_powerline-bash.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install powerline 
+apt install -y powerline 
 
 DEST=/etc/skel
 bash -c "cat > /etc/profile.d/powerline.sh" <<EOF

020_pyload.sh

@@ -8,4 +8,4 @@ RELEASE=$(curl -s https://api.github.com/repos/${PROJECT}/releases/latest | grep
 wget -c -P ${PREFIX} https://github.com/${PROJECT}/releases/download/${RELEASE}/${NAME}_${RELEASE}_amd64.deb 
 
 dpkg -i ${PREFIX}/${NAME}_${RELEASE}_amd64.deb 
-apt-get -f install
+apt install -f

020_qemu.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-apt-get install qemu qemu-kvm qemu-utils
+apt install -y qemu qemu-kvm qemu-utils

020_rancher-k3d.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-apt-get install -y golang-go
+apt install -y golang-go
 
 cd /var/tmp || exit
 

020_redshift.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install redshift
+apt install -y redshift
 
 /usr/bin/xfconf-query -c xfce4-session -p /startup/redshift/enabled -n -t bool -s true
 

020_refracta-tools.sh

@@ -2,8 +2,8 @@
 set -x
 # get and install refracta stuff
 # For jessie yad needs to be built from testing/ascii (and gtk3 dep changed in control)
-#apt-get -y install autotools-dev libgtk2.0-dev pkg-config intltool 
-#apt-get install -y sbuild fakeroot schroot
+#apt install -y autotools-dev libgtk2.0-dev pkg-config intltool 
+#apt install -y sbuild fakeroot schroot
 
 #cd /usr/src || exit
 #RELEASE=$(awk -F '/' \{'print $1'\} < /etc/devuan_version | awk '$1=$1')
@@ -20,8 +20,8 @@ set -x
 #sudo schroot --end-session --all-sessions
 
 # Refractasnapshot 10 introduces support of UEFI bootable iso but grub-efi removes grub-pc
-#apt-get install -y grub-efi-amd64
-apt-get install -y hwinfo
+#apt install -y grub-efi-amd64
+apt install -y hwinfo
 
 cd /var/tmp
 REFRACTAINSTALLERBASE_VERSION=9.5.3
@@ -48,4 +48,4 @@ URL_LIST=( \
 #for URL in ${URL_LIST[*]}; do printf "   %s\n" ${URL##*/}; done
 for URL in ${URL_LIST[*]}; do echo "${URL}"; wget -c "${URL}" && dpkg -i ./"${URL##*/}"; done
 
-apt-get -y -f install
+apt install -y -f

020_riotIM-nightly.sh

@@ -19,6 +19,6 @@ else
 		echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
 fi
 
-sudo apt-get update && apt-get -y install riot-nightly
+sudo apt update && apt install -y riot-nightly
 
 

020_riotIM-web.sh

@@ -20,6 +20,6 @@ else
 		echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
 fi
 
-sudo apt-get update && apt-get -y install riot-web
+sudo apt update && apt install -y riot-web
 
 

020_rox-filer.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ROX-Filer settings
-apt-get -y install rox-filer
-apt-get -y install xmlstarlet
+apt install -y rox-filer
+apt install -y xmlstarlet
 
 # Make changes to Options, menus2 using xmlstarlet at the bottom of this script.
 

020_sanoid.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
-sudo apt-get -y install \
+sudo apt install -y \
 	git \
 	dh-make \
 	libconfig-inifiles-perl

020_shellcheck.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install shellcheck
+apt install -y shellcheck
 
 DEST=/etc/skel
 # Works with shellcheck 0.7.0 onward
@@ -7,7 +7,7 @@ cat > ${DEST}/.shellcheckrc<<EOF
 disable=SC1117
 EOF
 
-#apt-get install cabal-install
+#apt install -y cabal-install
 #
 #cabal update
 #

020_slim.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Set enlightenment as the default session.
-apt-get install -y slim
+apt install -y slim
 
 DEST=/etc/skel
 

020_smartmon.sh

@@ -2,7 +2,7 @@
 #!/bin/bash
 set -x
 
-apt-get install -y smartmontools gsmartcontrol
+apt install -y smartmontools gsmartcontrol
 
 sed -i '/^#enable_smart=.*/ s/.*/&\nenable_smart=\"\"/' /etc/default/smartmontools
 

020_speechd-alsa.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Given a choice of selecting settings to match pulseaudio if installedor alsa when not, they just install it broken and recommend pulseaudio, nice.
 
-apt-get install speech-dispatcher speech-dispatcher-festival speech-dispatcher-espeak-ng python3-speechd espeek-ng espeak-ng-espeak 
+apt install -y speech-dispatcher speech-dispatcher-festival speech-dispatcher-espeak-ng python3-speechd espeek-ng espeak-ng-espeak 
 
 SPEECHD_CONF=/etc/speech-dispatcher/speechd.conf
 

020_surf.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get -y install surf2
+apt install -y surf2
 
 SOURCE_DIR=
 cd $[SOURCE_DIR]

020_swapspace.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-apt-get install swapspace
+apt install -y swapspace
 
 swappath="/var/lib/swapspace"
 lower_freelimit=20

020_themes.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-apt-get install -y mate-themes
-apt-get install -y albatross-gtk-theme
-apt-get install -y blackbird-gtk-theme
+apt install -y mate-themes
+apt install -y albatross-gtk-theme
+apt install -y blackbird-gtk-theme
 
-apt-get install -y gtk2-engines-murrine gtk2-engines-pixbuf
+apt install -y gtk2-engines-murrine gtk2-engines-pixbuf
 
 cd /var/tmp
 git clone https://github.com/vinceliuice/stylish-gtk-theme