diff --git a/001_apt-sources.sh b/001_apt-sources.sh index 0aa6e18..7d890b3 100755 --- a/001_apt-sources.sh +++ b/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 diff --git a/001_enable-binfmt-misc.sh b/001_enable-binfmt-misc.sh index 6e68b95..90ca28f 100755 --- a/001_enable-binfmt-misc.sh +++ b/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 diff --git a/001_locales.sh b/001_locales.sh index 6088d96..bcd13ab 100755 --- a/001_locales.sh +++ b/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" diff --git a/001_resolvconf.sh b/001_resolvconf.sh index 03cd5f3..8a185d1 100755 --- a/001_resolvconf.sh +++ b/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' diff --git a/010_alsa.sh b/010_alsa.sh index 339687f..7ffdaf3 100755 --- a/010_alsa.sh +++ b/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 diff --git a/010_apt-get.sh b/010_apt-get.sh index 23b2488..604b3fe 100755 --- a/010_apt-get.sh +++ b/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 diff --git a/010_broadcom-sta_wl.sh b/010_broadcom-sta_wl.sh index f511784..04dd396 100755 --- a/010_broadcom-sta_wl.sh +++ b/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 diff --git a/010_entropy-rgn-tools_haveged.sh b/010_entropy-rgn-tools_haveged.sh index d690db1..276da4b 100755 --- a/010_entropy-rgn-tools_haveged.sh +++ b/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 diff --git a/010_eudev.sh b/010_eudev.sh index b63db9c..16655b9 100755 --- a/010_eudev.sh +++ b/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 diff --git a/010_hddtemp.sh b/010_hddtemp.sh index 1895e30..3585693 100755 --- a/010_hddtemp.sh +++ b/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 diff --git a/010_liquorix-kernel.sh b/010_liquorix-kernel.sh index 2e9e859..67142bd 100755 --- a/010_liquorix-kernel.sh +++ b/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 diff --git a/010_nosh.sh b/010_nosh.sh index ef95583..e86ea55 100755 --- a/010_nosh.sh +++ b/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/ # diff --git a/010_openrc.sh b/010_openrc.sh index 77f2d2b..69e06c4 100755 --- a/010_openrc.sh +++ b/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 diff --git a/010_prelink.sh b/010_prelink.sh index b3fad3b..df74798 100755 --- a/010_prelink.sh +++ b/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 diff --git a/010_python.sh b/010_python.sh index 48f6dd7..5af0c93 100755 --- a/010_python.sh +++ b/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 diff --git a/010_saltstack.sh b/010_saltstack.sh index 96e0014..ee60c8b 100755 --- a/010_saltstack.sh +++ b/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 diff --git a/010_unattended-upgrades.sh b/010_unattended-upgrades.sh index 40e52cd..04cfa6b 100755 --- a/010_unattended-upgrades.sh +++ b/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 diff --git a/010_vdev.sh b/010_vdev.sh index 7d137ce..30dadc9 100755 --- a/010_vdev.sh +++ b/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 diff --git a/010_zfs.sh b/010_zfs.sh index 27d02b3..4c016ea 100755 --- a/010_zfs.sh +++ b/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 diff --git a/010_zram.sh b/010_zram.sh index 4740a86..edd10ce 100755 --- a/010_zram.sh +++ b/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 diff --git a/020_amprolla.sh b/020_amprolla.sh index 07d75a1..c6b262b 100755 --- a/020_amprolla.sh +++ b/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 diff --git a/020_arduino.sh b/020_arduino.sh index 534fbe3..7b598d9 100755 --- a/020_arduino.sh +++ b/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 diff --git a/020_audacity.sh b/020_audacity.sh index cdb3cad..4f2af0b 100755 --- a/020_audacity.sh +++ b/020_audacity.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -apt-get install -y audacity +apt install -y audacity diff --git a/020_blender.sh b/020_blender.sh index bc8db4e..3d4eb40 100755 --- a/020_blender.sh +++ b/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 diff --git a/020_bluez-alsa_dhmake.sh b/020_bluez-alsa_dhmake.sh index f04a4ce..f083745 100755 --- a/020_bluez-alsa_dhmake.sh +++ b/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 \ diff --git a/020_bootchart.sh b/020_bootchart.sh index fd12d87..828edca 100755 --- a/020_bootchart.sh +++ b/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 diff --git a/020_broot.sh b/020_broot.sh index ef766c7..8e7eb55 100755 --- a/020_broot.sh +++ b/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 < 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 < /etc/rc.local -## Start bluealsa as root -#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 '' 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 - -#------------------------------------------------------------------------ diff --git a/020_bunsenlabs.sh b/020_bunsenlabs.sh index f8bc5a8..f9e5d33 100755 --- a/020_bunsenlabs.sh +++ b/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 \ diff --git a/020_chrome-browser.sh b/020_chrome-browser.sh index b0e3f52..a632247 100755 --- a/020_chrome-browser.sh +++ b/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. diff --git a/020_conky.sh b/020_conky.sh index 5f1966e..d5b2deb 100755 --- a/020_conky.sh +++ b/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/ diff --git a/020_console.sh b/020_console.sh index d9f730d..b711b6f 100755 --- a/020_console.sh +++ b/020_console.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +apt install -y console-setup # dpkg-reconfigure console-setup # Original settings diff --git a/020_deprecated-sysv-utils.sh b/020_deprecated-sysv-utils.sh index 3d0f4f5..6eb4559 100755 --- a/020_deprecated-sysv-utils.sh +++ b/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 diff --git a/020_devuan_arm-sdk.sh b/020_devuan_arm-sdk.sh index 3cc0b67..6c310e6 100755 --- a/020_devuan_arm-sdk.sh +++ b/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 diff --git a/020_dissenter-browser.sh b/020_dissenter-browser.sh index bc47d6c..a70b7af 100755 --- a/020_dissenter-browser.sh +++ b/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 diff --git a/020_djmount.sh b/020_djmount.sh index 6e60e8e..bb0a2b3 100755 --- a/020_djmount.sh +++ b/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 diff --git a/020_docker.sh b/020_docker.sh index b5b335f..66e9611 100755 --- a/020_docker.sh +++ b/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 diff --git a/020_epson-driver.sh b/020_epson-driver.sh index a3d97d7..e393196 100755 --- a/020_epson-driver.sh +++ b/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 diff --git a/020_etcher.sh b/020_etcher.sh index 7e1a353..12af8f4 100755 --- a/020_etcher.sh +++ b/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 diff --git a/020_etckeeper.sh b/020_etckeeper.sh index 4c25aa3..f1bf42c 100755 --- a/020_etckeeper.sh +++ b/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 diff --git a/020_firmware.sh b/020_firmware.sh index 3381d0d..a9679e5 100755 --- a/020_firmware.sh +++ b/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 diff --git a/020_fish.sh b/020_fish.sh index 5cc1aa0..4c88edc 100755 --- a/020_fish.sh +++ b/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 diff --git a/020_fmui.sh b/020_fmui.sh index c7a17cb..e7ef8fd 100755 --- a/020_fmui.sh +++ b/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 diff --git a/020_free42.sh b/020_free42.sh index 3b0f530..5bfecee 100755 --- a/020_free42.sh +++ b/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 diff --git a/020_free42_from_dsc.sh b/020_free42_from_dsc.sh index 5ba6453..d5d30da 100755 --- a/020_free42_from_dsc.sh +++ b/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" diff --git a/020_freecad.sh b/020_freecad.sh index ca133a8..59f495f 100755 --- a/020_freecad.sh +++ b/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 diff --git a/020_git-cola.sh b/020_git-cola.sh index 8a69eda..9ba8444 100755 --- a/020_git-cola.sh +++ b/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 diff --git a/020_git-lfs.sh b/020_git-lfs.sh index f083841..06826da 100755 --- a/020_git-lfs.sh +++ b/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" diff --git a/020_git-mergetool.sh b/020_git-mergetool.sh index 8a15f7c..c0dad9f 100755 --- a/020_git-mergetool.sh +++ b/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 diff --git a/020_gitlab-runner.sh b/020_gitlab-runner.sh index 2a0b9a4..efd4cfb 100755 --- a/020_gitlab-runner.sh +++ b/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 diff --git a/020_grc.sh b/020_grc.sh index ceeb032..05cb6d4 100755 --- a/020_grc.sh +++ b/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/ diff --git a/020_hexchat.sh b/020_hexchat.sh index 231b577..41bbe02 100755 --- a/020_hexchat.sh +++ b/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 diff --git a/020_jack.sh b/020_jack.sh index aa1b071..5204c1a 100755 --- a/020_jack.sh +++ b/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 diff --git a/020_jitsi.sh b/020_jitsi.sh index dd17ca2..c2dbcf7 100755 --- a/020_jitsi.sh +++ b/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 diff --git a/020_jq.sh b/020_jq.sh index 2f0c639..fc3c02c 100755 --- a/020_jq.sh +++ b/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 \ diff --git a/020_keepass.sh b/020_keepass.sh index 5109e82..9d0411b 100755 --- a/020_keepass.sh +++ b/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 diff --git a/020_kodi_nightly_ppa.sh b/020_kodi_nightly_ppa.sh index 28ae691..7ef0dac 100755 --- a/020_kodi_nightly_ppa.sh +++ b/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 diff --git a/020_kodi_ppa.sh b/020_kodi_ppa.sh index 9d99053..05296c0 100755 --- a/020_kodi_ppa.sh +++ b/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 diff --git a/020_lsd.sh b/020_lsd.sh index 1df72d1..44f85a4 100755 --- a/020_lsd.sh +++ b/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 diff --git a/020_lxc.sh b/020_lxc.sh index cb7f864..f2aaf3c 100755 --- a/020_lxc.sh +++ b/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 diff --git a/020_lxd.sh b/020_lxd.sh index 2322371..6548dfa 100755 --- a/020_lxd.sh +++ b/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 \ diff --git a/020_lxdm-xfce4.sh b/020_lxdm-xfce4.sh index f9a3dcb..a858dd4 100755 --- a/020_lxdm-xfce4.sh +++ b/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 diff --git a/020_matrix-synapse-server.sh b/020_matrix-synapse-server.sh index aea3c9e..d61b247 100755 --- a/020_matrix-synapse-server.sh +++ b/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 diff --git a/020_meld.sh b/020_meld.sh index aa52845..e5cdbe6 100755 --- a/020_meld.sh +++ b/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' diff --git a/020_mkusb.sh b/020_mkusb.sh index 9050d43..b36bf8f 100755 --- a/020_mkusb.sh +++ b/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 diff --git a/020_molly-guard.sh b/020_molly-guard.sh index 89029cd..7d0c0bd 100755 --- a/020_molly-guard.sh +++ b/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 diff --git a/020_mps-youtube.sh b/020_mps-youtube.sh index 4ad1e1c..982bf1e 100755 --- a/020_mps-youtube.sh +++ b/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 diff --git a/020_mpv.sh b/020_mpv.sh index 281ddd5..f12307b 100755 --- a/020_mpv.sh +++ b/020_mpv.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -apt-get -y install mpv +apt install -y mpv mkdir -p ~/.config/mpv diff --git a/020_mutt-khard.sh b/020_mutt-khard.sh index 297c49f..d2b7a81 100755 --- a/020_mutt-khard.sh +++ b/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 diff --git a/020_mutt-notmuch-afew.sh b/020_mutt-notmuch-afew.sh index 4c20dbd..3cd5a37 100755 --- a/020_mutt-notmuch-afew.sh +++ b/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/ diff --git a/020_mutt-notmuch.sh b/020_mutt-notmuch.sh index f709042..c60d009 100755 --- a/020_mutt-notmuch.sh +++ b/020_mutt-notmuch.sh @@ -5,7 +5,7 @@ #macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~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' \`\"" "show only messages matching a notmuch pattern" -apt-get install -y notmuch-mutt +apt install -y notmuch-mutt NEOMUTTCONF="/etc/skel/.config/mutt/" diff --git a/020_mutt-wizard.sh b/020_mutt-wizard.sh index b53c14c..5303140 100755 --- a/020_mutt-wizard.sh +++ b/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 diff --git a/020_nanorc.sh b/020_nanorc.sh index a7da37e..2129eab 100755 --- a/020_nanorc.sh +++ b/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 diff --git a/020_neofetch_motd.sh b/020_neofetch_motd.sh index 77ea1f0..bf8f985 100755 --- a/020_neofetch_motd.sh +++ b/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 < ${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 diff --git a/020_pidgin.sh b/020_pidgin.sh index 4d55086..bef5df2 100755 --- a/020_pidgin.sh +++ b/020_pidgin.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -apt-get install -y pidgin pidgin-otr +apt install -y pidgin pidgin-otr diff --git a/020_platformio-core.sh b/020_platformio-core.sh index f47201f..08780db 100755 --- a/020_platformio-core.sh +++ b/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)" diff --git a/020_powerline-bash.sh b/020_powerline-bash.sh index 96a243a..6f9e2a2 100755 --- a/020_powerline-bash.sh +++ b/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" <> /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 diff --git a/020_riotIM-web.sh b/020_riotIM-web.sh index 673c28d..2e74e34 100755 --- a/020_riotIM-web.sh +++ b/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 diff --git a/020_rox-filer.sh b/020_rox-filer.sh index cfdb15b..68b967d 100755 --- a/020_rox-filer.sh +++ b/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. diff --git a/020_sanoid.sh b/020_sanoid.sh index eea0250..d00cb29 100755 --- a/020_sanoid.sh +++ b/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 diff --git a/020_shellcheck.sh b/020_shellcheck.sh index 978e1eb..3c505c1 100755 --- a/020_shellcheck.sh +++ b/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< ~/.config/autostart/tilda.desktop <<'EOF' diff --git a/020_tmux.sh b/020_tmux.sh index b46c090..71d04bd 100755 --- a/020_tmux.sh +++ b/020_tmux.sh @@ -5,10 +5,10 @@ apt-cache search tmux apt-cache search tmux-plugin-manager apt-cache search tmuxp -apt-get update -apt-get install -y tmux -apt-get install -y tmux-plugin-manager -apt-get install -y tmuxp # uses python rather than ruby used by tmuxinator. +apt update +apt install -y tmux +apt install -y tmux-plugin-manager +apt install -y tmuxp # uses python rather than ruby used by tmuxinator. DEST=/etc/skel # https://github.com/Netherdrake/Dotfiles/tree/master/config/tmux diff --git a/020_torbrowser.sh b/020_torbrowser.sh index 6b75c76..0df4437 100755 --- a/020_torbrowser.sh +++ b/020_torbrowser.sh @@ -18,4 +18,4 @@ # Move to using torbrowser-launcher - if unavailable use build_deb_from_dsc.sh -apt-get install -y torbrowser-launcher +apt install -y torbrowser-launcher diff --git a/020_torproject.sh b/020_torproject.sh index 6335739..e13fb15 100755 --- a/020_torproject.sh +++ b/020_torproject.sh @@ -2,7 +2,7 @@ AVAILABLE=/etc/apt/sources.list-available ACTIVE=/etc/apt/sources.list.d -apt-get install -y apt-transport-https +apt install -y apt-transport-https bash -c "cat > ${AVAILABLE}/torproject.list" < ${DEST}/.Xresources << 'EOF' EOF cd ${DEST} || exit -apt-get install -y git +apt install -y git git clone https://github.com/VundleVim/Vundle.vim.git ${DEST}/.vim/bundle/Vundle.vim # Prepend to the .vimrc @@ -412,14 +412,15 @@ HOME=${DEST} vim -V -E -s -c "source ${DEST}/.vimrc" -c "PluginInstall" -c "Plug #HOME=${DEST} vim -V -E -s /tmp/tempdir <<-EOF # :source ${DEST}/.vimrc +# :call coc#util#install() # :CocStart # :CocInstall coc-java coc-go coc-python coc-flutter coc-css coc-cssmodules coc-xml coc-json coc-yaml coc-html coc-git coc-docker # :qa! #EOF # Install YouCompleteMe support -apt-get install -y build-essential cmake exuberant-ctags -apt-get install -y python-dev python3-dev +apt install -y build-essential cmake exuberant-ctags +apt install -y python-dev python3-dev # semantic support for C-family #cd $HOME/.vim/bundle/YouCompleteMe/ && ./install.py --clang-completer @@ -435,11 +436,11 @@ apt-get install -y python-dev python3-dev #./build.py --all # jedi-vim (since youcompleteme seems to just crash) -apt-get install -y python-pip -apt-get install -y pylama pylint flake8 +apt install -y python-pip +apt install -y pylama pylint flake8 # available in unstable of old-stable only -#apt-get install -y prospector +#apt install -y prospector # FIXME: Install prospector # pip install prospector[with_pyroma] diff --git a/020_waterfox.sh b/020_waterfox.sh index 8651573..646b130 100755 --- a/020_waterfox.sh +++ b/020_waterfox.sh @@ -16,7 +16,7 @@ ln -sf /etc/apt/sources.list-available/waterfox.list /etc/apt/sources.list.d/wat wget -nv https://download.opensuse.org/repositories/home:hawkeye116477:waterfox/Debian_Testing/Release.key -O Release.key apt-key add - < Release.key -apt-get update +apt update # waterfox-classic-kde - KDE Plasma integration for Waterfox Classic # waterfox-classic-kpe - Free, open and private browser with openSUSE's patches for better integration with KDE @@ -26,7 +26,7 @@ apt-get update # waterfox-current-kpe - Free, open and private browser with better integration with KDE # waterfox-current-i18n-en-gb - English (British) language pack for Waterfox Current -apt-get install -y waterfox-classic-kpe watefox-classic-i18n-en-gb +apt install -y waterfox-classic-kpe watefox-classic-i18n-en-gb update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-classic 201 diff --git a/020_wireguard.sh b/020_wireguard.sh index f561340..7a90493 100755 --- a/020_wireguard.sh +++ b/020_wireguard.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -apt-get update -apt-get install wireguard-dkms wireguard-tools +apt update +apt install -y wireguard-dkms wireguard-tools LISTENPORT=51820 diff --git a/020_xmonad.sh b/020_xmonad.sh index 6eba900..33dd3c1 100755 --- a/020_xmonad.sh +++ b/020_xmonad.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -apt-get install -y xmonad xmobar +apt install -y xmonad xmobar wget -c -P ~/.config/xmobar/ https://gitlab.com/dwt1/dotfiles/raw/master/.config/xmobar/xmobarrc0 wget -c -P ~/.config/xmobar/ https://gitlab.com/dwt1/dotfiles/raw/master/.config/xmobar/xmobarrc1 diff --git a/020_yarn.sh b/020_yarn.sh index 8523bdb..888a812 100644 --- a/020_yarn.sh +++ b/020_yarn.sh @@ -1,10 +1,26 @@ +#!/usr/bin/env bash +RELEASE=stable +URL="dl.yarnpkg.com" -curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - -echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list-available/yarn.list +curl -sS https://${URL}/debian/pubkey.gpg | sudo apt-key add - +echo "deb https://${URL}/debian/ ${RELEASE} main" | sudo tee /etc/apt/sources.list-available/yarn.list ln -s /etc/apt/sources.list-available/yarn.list /etc/apt/sources.list.d/yarn.list - +# Bypass apt-proxy for yarn packages +# if 02proxy exists check to see if the url is already in it, if so do nothing , if it isn't add it, +# if 02proxy doesn't exist create it. successful grep 0, unsuccessful 1 +if [ -f /etc/apt/apt.conf.d/02proxy ]; then + echo "02proxy contains: " + cat /etc/apt/apt.conf.d/02proxy + if [ ! -z $(grep ${URL} /etc/apt/apt.conf.d/02proxy) ]; then + echo "first" + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + fi +else + echo "second" + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy +fi sudo apt update && sudo apt install -y --no-install-recommends yarn diff --git a/020_youtube-dl.sh b/020_youtube-dl.sh index 8c1e4f1..50de78f 100755 --- a/020_youtube-dl.sh +++ b/020_youtube-dl.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -apt-get -y install youtube-dl +apt install -y youtube-dl ## https://github.com/rg3/youtube-dl/blob/master/README.md#configuration diff --git a/020_yq.sh b/020_yq.sh index 340125a..b44b5b8 100755 --- a/020_yq.sh +++ b/020_yq.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -x -sudo apt-get -y install \ +sudo apt install -y \ jq \ dh-make \ python-flake8 \ diff --git a/020_zfs-auto-snapshot.sh b/020_zfs-auto-snapshot.sh index 9380dee..7e89b50 100755 --- a/020_zfs-auto-snapshot.sh +++ b/020_zfs-auto-snapshot.sh @@ -3,12 +3,12 @@ ## 1. zfs-auto-snapshot or equivalent package installed locally and regular ## snapshots enabled (hourly, daily, etc.) # NB now available in ascii with: -# apt-get install zfs-auto-snapshot +# apt install -y zfs-auto-snapshot # or: ## Make ZFS Snapshots work on Debian ## A .deb package can be created for zfs-auto-snapshot: -apt-get -y install git build-essential zfsnap -apt-get -y install zfs-auto-snapshot +apt install -y git build-essential zfsnap +apt install -y zfs-auto-snapshot #ZSH_BUILD_HOME=/var/tmp/zfs-auto-snapshot #mkdir -p ${ZSH_BUILD_HOME} && \ # cd ${ZSH_BUILD_HOME} && \ diff --git a/020_zfs-sanoid.sh b/020_zfs-sanoid.sh index 812063f..b0f2e03 100755 --- a/020_zfs-sanoid.sh +++ b/020_zfs-sanoid.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -apt-get install libconfig-inifiles-perl git +apt install -y libconfig-inifiles-perl git cd /opt git clone https://github.com/jimsalterjrs/sanoid diff --git a/020_zfs-znapzend.sh b/020_zfs-znapzend.sh index cfa17f8..e5abeda 100755 --- a/020_zfs-znapzend.sh +++ b/020_zfs-znapzend.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -apt-get install mbuffer +apt install -y mbuffer ## Using checkinstall #ZZ_VERSION=0.17.0 diff --git a/020_zsh.sh b/020_zsh.sh index 50a04a3..e791852 100755 --- a/020_zsh.sh +++ b/020_zsh.sh @@ -9,10 +9,10 @@ exit 1 # #wget -qO - https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Debian_9.0/Release.key | sudo apt-key add - # -#sudo apt-get update -#sudo apt-get install zsh-completions +#sudo apt update +#sudo apt install zsh-completions -apt-get -y install zsh nodejs-legacy zsh-theme-powerlevel9k +apt install -y zsh nodejs-legacy zsh-theme-powerlevel9k set -x # compaudit # There are insecure directories: /usr/local/share/zsh/site-functions @@ -25,9 +25,9 @@ chmod g-w /usr/local/share/zsh/site-functions cd ~ || exit chsh -s "$(which zsh)" "${USER}" -apt-get install -y git +apt install -y git # Install zgen plugin manager and zsh quicktart to get a default setup for zsh -git clone http://github.com/tarjoilija/zgen # available with apt-get install zgen which installs to /usr/share/zgen +git clone http://github.com/tarjoilija/zgen # available with apt install zgen which installs to /usr/share/zgen #git clone http://github.com/unixorn/zsh-quickstart-kit # FIXME: needs to be packaged mkdir -p ~/.zgen/robbyrussell/ git clone http://github.com/ohmyzsh/ohmyzsh ~/.zgen/robbyrussell/ohmyzsh @@ -214,7 +214,7 @@ EOF #echo 'QUICKSTART_KIT_REFRESH_IN_DAYS=30' >> ~/.zshrc.d/001-quickstart_refresh.zsh echo 'ZGEN_PLUGIN_UPDATE_DAYS=30' > ~/.zshrc.d/001_zgen-refresh.zsh -apt-get install -y fonts-powerline powerline +apt install -y fonts-powerline powerline # sed -i 's,^\(export LOCATE_PATH=\).*,\1'/var/lib/mlocate/mlocate.db',' ~/.zshrc # Use powerline-daemon to speedup the prompt. diff --git a/020_zsh_quickstart.sh b/020_zsh_quickstart.sh index f84d15b..0021896 100755 --- a/020_zsh_quickstart.sh +++ b/020_zsh_quickstart.sh @@ -7,10 +7,10 @@ # #wget -qO - https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Debian_9.0/Release.key | sudo apt-key add - # -#sudo apt-get update -#sudo apt-get install zsh-completions +#sudo apt update +#sudo apt install zsh-completions -apt-get -y install zsh nodejs zsh-theme-powerlevel9k +apt install -y zsh nodejs zsh-theme-powerlevel9k set -x # compaudit # There are insecure directories: /usr/local/share/zsh/site-functions @@ -27,9 +27,9 @@ chsh -s "$(which zsh)" "${USER}" DEST=/etc/skel HOME=${DEST} -apt-get install -y git +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-get install zgen which installs to /usr/share/zgen +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 mkdir -p ${DEST}/.zgen/robbyrussell/ git clone http://github.com/ohmyzsh/ohmyzsh ${DEST}/.zgen/robbyrussell/ohmyzsh @@ -208,7 +208,7 @@ EOF #echo 'QUICKSTART_KIT_REFRESH_IN_DAYS=30' >> ~/.zshrc.d/001_quickstart-refresh.zsh echo 'ZGEN_PLUGIN_UPDATE_DAYS=30' > ${DEST}/.zshrc.d/001_zgen-refresh.zsh -apt-get install -y fonts-powerline powerline +apt install -y fonts-powerline powerline # sed -i 's,^\(export LOCATE_PATH=\).*,\1'/var/lib/mlocate/mlocate.db',' ~/.zshrc # Use powerline-daemon to speedup the prompt. diff --git a/025_festival-voices.sh b/025_festival-voices.sh index 8a92cab..f126375 100755 --- a/025_festival-voices.sh +++ b/025_festival-voices.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -apt-get -y install --force-yes festvox-rablpc16k festival +apt install -y --force-yes festvox-rablpc16k festival diff --git a/025_firefox-extensions.sh b/025_firefox-extensions.sh index fb6d45c..2291529 100755 --- a/025_firefox-extensions.sh +++ b/025_firefox-extensions.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -apt-get -y install mozilla-devscripts -apt-get -y install xul-ext-webdeveloper -apt-get -y install xul-ext-itsalltext -apt-get -y install xul-ext-greasemonkey -apt-get -y install xul-ext-firebug -apt-get -y install xul-ext-firexpath +apt install -y mozilla-devscripts +apt install -y xul-ext-webdeveloper +apt install -y xul-ext-itsalltext +apt install -y xul-ext-greasemonkey +apt install -y xul-ext-firebug +apt install -y xul-ext-firexpath # See https://www.legroom.net/howto/firefox #user_pref("privacy.trackingprotection.enabled "true"); diff --git a/025_thunderbird-extensions.sh b/025_thunderbird-extensions.sh index c18afa7..125e7b3 100755 --- a/025_thunderbird-extensions.sh +++ b/025_thunderbird-extensions.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # thunderbird/icedove extensions -#apt-get -y install xul-ext-tbdialout +#apt install -y xul-ext-tbdialout # https://doc.owncloud.org/server/5.0/user_manual/pim/sync_thunderbird.html -#apt-get -y install xul-ext-sogo-connector -apt-get -y install xul-ext-firetray -#apt-get -y install iceowl-extension +#apt install -y xul-ext-sogo-connector +apt install -y xul-ext-firetray +#apt install -y iceowl-extension diff --git a/025_xfce4-settings.sh b/025_xfce4-settings.sh index c862d7f..cbd85d2 100755 --- a/025_xfce4-settings.sh +++ b/025_xfce4-settings.sh @@ -41,7 +41,7 @@ xfconf-query -c xfwm4 -p /general/workspace_count -n -s 8 # selector which does. #set uk keyboard #sed -i 's,^\(layouts=\).*,\1'gb',' ~/.config/xfce4/panel/xkb-plugin-18.rc -apt-get -y remove xfce4-xkb-plugin +apt remove -y xfce4-xkb-plugin killall -HUP $(ps aux | grep -v grep | grep xfce4-xkb-plugin | awk {'print $2'}) xfconf-query -c keyboard-layout -p /Default/XkbLayout -n -t string -s gb xfconf-query -c keyboard-layout -p /Default/XkbDisable -n -t bool -s false diff --git a/050_remove_avahi.sh b/050_remove_avahi.sh index 325a1ea..dc55738 100755 --- a/050_remove_avahi.sh +++ b/050_remove_avahi.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash # removing any more of avahi need rebuilding of libpurple libgnomevfs libgnome2 bash -c "update-rc.d avahi-daemon disable" -apt-get -y remove --purge cups-browsed avahi-autoipd +apt remove -y --purge cups-browsed avahi-autoipd echo " This stops the avahi daemon but the dependencies of any of the libavahi reach throught to just about all desktop packages." -#apt-get -y remove --purge libavahi-common-data libavahi-common3 avahi-daemon libavahi-glib1 libavahi-client3 +#apt remove -y --purge libavahi-common-data libavahi-common3 avahi-daemon libavahi-glib1 libavahi-client3 diff --git a/050_remove_flash.sh b/050_remove_flash.sh index e2606e3..d286be8 100755 --- a/050_remove_flash.sh +++ b/050_remove_flash.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -apt-get -y remove --purge flashplugin-nonfree +apt remove -y --purge flashplugin-nonfree diff --git a/050_remove_gnome-keyring.sh b/050_remove_gnome-keyring.sh index a969c89..ce7cc44 100755 --- a/050_remove_gnome-keyring.sh +++ b/050_remove_gnome-keyring.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -apt-get -y remove gnome-keyring -apt-get -y remove libpam-gnome-keyring +apt remove -y gnome-keyring +apt remove -y libpam-gnome-keyring diff --git a/050_remove_gvfs.sh b/050_remove_gvfs.sh index cd762bc..d2f597d 100755 --- a/050_remove_gvfs.sh +++ b/050_remove_gvfs.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Provides automounting of devices to random places when you'd rather just manually mount or not mount at all. -apt-get -y remove --purge gvfs-daemons +apt remove -y --purge gvfs-daemons diff --git a/050_remove_policykit-1.sh b/050_remove_policykit-1.sh index 41f9ae0..299428e 100755 --- a/050_remove_policykit-1.sh +++ b/050_remove_policykit-1.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # From the people who thought bash scripts in init.d were too complicated we get javascript snipits and xml based configuration files to set permissions, just say no. -apt-get -y remove --purge policykit-1 +apt remove -y --purge policykit-1 # This does a number of good things, removing: # hplip diff --git a/050_remove_xscreensaver.sh b/050_remove_xscreensaver.sh index 0e63e41..e1364e7 100755 --- a/050_remove_xscreensaver.sh +++ b/050_remove_xscreensaver.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -apt-get -y remove --purge xscreensaver xscreensaver-data +apt -y remove --purge xscreensaver xscreensaver-data diff --git a/050_set-reboot_policykit-1.sh b/050_set-reboot_policykit-1.sh index 87bd30f..735ad7f 100755 --- a/050_set-reboot_policykit-1.sh +++ b/050_set-reboot_policykit-1.sh @@ -58,7 +58,7 @@ # -apt-get install xmlstarlet +apt install -y xmlstarlet POLKIT_HOME=/usr/share/polkit-1 # org.freedesktop.consolekit.system.stop yes diff --git a/050_wicd.sh b/050_wicd.sh index 859df25..fda0235 100755 --- a/050_wicd.sh +++ b/050_wicd.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # Remove network-manager if present. -#apt-get -y remove --purge network-manager* gir1.2-networkmanager-1.0 gir1.2-nmgtk-common libnm-* -#apt-get -y remove --purge libnm-gtk +#apt -y remove --purge network-manager* gir1.2-networkmanager-1.0 gir1.2-nmgtk-common libnm-* +#apt -y remove --purge libnm-gtk #rm /home/user/.config/autostart/nm-applet.destop # At some point we will move from ifconfig and iwconfig to ip and iw but wicd seems to only be partially their so: -apt-get -y install iw net-tools iproute2 -apt-get -y install wicd wicd-gtk wicd-curses +apt install -y iw net-tools iproute2 +apt install -y wicd wicd-gtk wicd-curses # Stop the gtk wicd client, it doesn't like files being changes under it. Even if you delette the file, when it exits it writes out its settings. #PID=`ps aux | grep python | grep wicd-client| awk {'print $2'}` diff --git a/100_safe_autoremove.sh b/100_safe_autoremove.sh index 9f4da09..c1a9b25 100755 --- a/100_safe_autoremove.sh +++ b/100_safe_autoremove.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash # A number of packages are due to be removed by apt, put them back on. -bash -c 'apt-mark showauto | grep -v ^lib | xargs apt-get -y install' -bash -c 'apt-mark showauto | grep libreoffice| xargs apt-get -y install' -bash -c 'apt-mark showauto | grep gnupg| xargs apt-get -y install' -bash -c 'apt-mark showauto | grep linux-image| xargs apt-get -y install' -bash -c 'apt-get -y autoremove' +bash -c 'apt-mark showauto | grep -v ^lib | xargs apt install -y' +bash -c 'apt-mark showauto | grep libreoffice| xargs apt install -y' +bash -c 'apt-mark showauto | grep gnupg| xargs apt install -y' +bash -c 'apt-mark showauto | grep linux-image| xargs apt install -y' +bash -c 'apt autoremove -y' diff --git a/101_livecd-add-zfs.sh b/101_livecd-add-zfs.sh index 135a21b..ae622cb 100755 --- a/101_livecd-add-zfs.sh +++ b/101_livecd-add-zfs.sh @@ -25,9 +25,9 @@ mount -t proc /proc ${ZFS_HOME}/proc mkdir -p ${ZFS_HOME}/run mount -o bind /run ${ZFS_HOME}/run -chroot ${ZFS_HOME} bash -c 'apt-get install -y --reinstall dkms spl-dkms gcc-6 libc6-dev debhelper dh-autoreconf linux-headers-4.9.0-4-all-amd64' +chroot ${ZFS_HOME} bash -c 'apt install -y --reinstall dkms spl-dkms gcc-6 libc6-dev debhelper dh-autoreconf linux-headers-4.9.0-4-all-amd64' -chroot ${ZFS_HOME} bash -c 'apt-get install -y --reinstall zfs-dkms zfs-initramfs zfsnap zfsutils-linux busybox' +chroot ${ZFS_HOME} bash -c 'apt install -y --reinstall zfs-dkms zfs-initramfs zfsnap zfsutils-linux busybox' chroot ${ZFS_HOME} bash -c "cat > /usr/share/initramfs-tools/conf.d/zfs" << 'EOF' for x in $(cat /proc/cmdline) @@ -44,7 +44,7 @@ EOF chroot ${ZFS_HOME} ls /var/lib/initramfs-tools | sudo xargs -n1 /usr/lib/dkms/dkms_autoinstaller start -chroot ${ZFS_HOME} bash -c 'apt-get -y -f install' +chroot ${ZFS_HOME} bash -c 'apt -y -f install' # Rebuild drivers #chroot ${ZFS_HOME} dpkg-reconfigure spl-dkms @@ -52,8 +52,8 @@ chroot ${ZFS_HOME} bash -c 'apt-get -y -f install' # Update initramfs # Error: live system without live media mounted as /lib/live/mount/medium -chroot ${ZFS_HOME} bash -c 'apt-get remove -y live-tools' -chroot ${ZFS_HOME} bash -c 'apt-get install -y initramfs-tools' +chroot ${ZFS_HOME} bash -c 'apt remove -y live-tools' +chroot ${ZFS_HOME} bash -c 'apt install -y initramfs-tools' chroot ${ZFS_HOME} bash -c 'update-initramfs -v -u -t -k all' # Update grub menu diff --git a/build_deb_from_dsc.sh b/build_deb_from_dsc.sh index 5fb20fb..487b37b 100755 --- a/build_deb_from_dsc.sh +++ b/build_deb_from_dsc.sh @@ -3,7 +3,7 @@ BUILDDIR=$1 DSC_FILE=$2 -apt-get install -y git-buildpackage equivs +apt install -y git-buildpackage equivs if [ "$1" == "-h" ]; then echo "Usage: `basename $0` Takes a build location and a dsc file @@ -39,7 +39,7 @@ APT_REMOVE=${DEPS_DEB%%\_*} INSTALL_DEB=${APT_REMOVE%%_*} echo "LSD: ${INSTALL_DEB}" dpkg -i ${INSTALL_DEB}_*deb -apt-get -f install -y +apt install -y -f diff --git a/build_deb_from_git.sh b/build_deb_from_git.sh index f4bc73b..c083b88 100755 --- a/build_deb_from_git.sh +++ b/build_deb_from_git.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 \ diff --git a/extract_chroot_image.sh b/extract_chroot_image.sh index 71e38f6..213e37d 100755 --- a/extract_chroot_image.sh +++ b/extract_chroot_image.sh @@ -18,7 +18,7 @@ wget -c ${FILE_URL}/${XZIMAGE} unxz ${XZIMAGE} # Mount the partitions -apt-get install -y kpartx +apt install -y kpartx kpartx -a -v ${IMAGE} diff --git a/generate-gpg-key.sh b/generate-gpg-key.sh index 7d21241..2a4ed9b 100644 --- a/generate-gpg-key.sh +++ b/generate-gpg-key.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -x -#apt-get install -y rng-tools gnupg2 +#apt install -y rng-tools gnupg2 sudo rngd -b -r /dev/urandom diff --git a/onivim2.sh b/onivim2.sh index 3ee9bbe..75c99b4 100755 --- a/onivim2.sh +++ b/onivim2.sh @@ -1,4 +1,4 @@ -apt-get install jq +apt install -y jq set -x PROJECT=onivim/oni diff --git a/sbuild-devuan.sh b/sbuild-devuan.sh index 2914161..5d87aa3 100755 --- a/sbuild-devuan.sh +++ b/sbuild-devuan.sh @@ -6,7 +6,7 @@ KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg INCLUDE="eatmydata,ccache,gnupg,debhelper,autotools-dev" MIRROR=http://pkgmaster.devuan.org/merged -apt-get install -y sbuild +apt install -y sbuild mkdir -p /root/.gnupg # To work around #792100 sbuild-update --keygen # see #801798 sbuild-adduser "${LOGNAME}"