From b02aada2e6eadc602fb661faf21aa0ed40e29ae8 Mon Sep 17 00:00:00 2001
From: Cyteen <cyteen@ring-zero.co.uk>
Date: Tue, 31 Oct 2017 13:07:37 +0000
Subject: [PATCH] Remove sudo from scripts, add shellcheck jitsi and 02proxy,
 should be separate commits, will do better next time.

---
 001-udev-rules.sh              |  8 +++++
 001_apt-proxy.sh               |  2 +-
 001_apt_suggests-recommends.sh |  8 ++---
 001_docker_grub-commandline.sh |  2 +-
 001_prevent_udev_net-rename.sh |  2 +-
 001_resolvconf.sh              |  8 ++---
 001_set_02proxy.sh             |  2 ++
 001_ssh.sh                     |  6 ++--
 001_system_bell.sh             |  8 ++---
 010_alsa.sh                    | 16 ++++-----
 010_apt-get.sh                 | 60 +++++++++++++++++-----------------
 010_salt.sh                    |  4 +--
 010_saltstack.sh               | 20 ++++++------
 010_sysctl.sh                  |  6 ++--
 020_arduino.sh                 |  4 +--
 020_chrome-browser.sh          |  4 +--
 020_conky.sh                   |  2 +-
 020_docker.sh                  | 44 ++++++++++++++-----------
 020_firmware.sh                | 10 +++---
 020_fish.sh                    |  2 +-
 020_fossamail.sh               | 12 +++----
 020_free42.sh                  |  2 +-
 020_hexchat.sh                 |  2 +-
 020_iridiumbrowser.sh          |  6 ++--
 020_jitsi.sh                   | 41 +++++++++++++++++++++++
 020_lxc.sh                     |  2 +-
 020_neovim.sh                  | 21 +++++++-----
 020_palemoon.sh                | 16 ++++-----
 020_pidgin.sh                  |  2 +-
 020_pycharm-install.sh         |  4 +--
 020_redshift.sh                |  2 +-
 020_refracta-tools.sh          |  2 +-
 020_rox-filer.sh               |  4 +--
 020_shellcheck.sh              | 24 ++++++++++++++
 020_tilda.sh                   |  6 ++--
 020_unetbootin.sh              |  6 ++--
 020_vim.sh                     |  9 +++--
 020_zsh.sh                     | 14 ++++----
 025_festival-voices.sh         |  2 +-
 025_firefox-extensions.sh      | 32 +++++++++---------
 025_remove-fossamail.sh        |  4 +--
 025_thunderbird-extensions.sh  |  8 ++---
 025_xfce4-settings.sh          |  4 +--
 025_xfce4-theme-fix.sh         | 50 ++++++++++++++--------------
 050_remove_avahi.sh            |  6 ++--
 050_remove_flash.sh            |  2 +-
 050_remove_gnome-keyring.sh    |  4 +--
 050_remove_gvfs.sh             |  2 +-
 050_remove_policykit-1.sh      |  2 +-
 050_remove_xscreensaver.sh     |  2 +-
 050_wicd.sh                    | 26 +++++++--------
 sbuild-devuan.sh               | 12 +++----
 52 files changed, 318 insertions(+), 231 deletions(-)
 create mode 100644 001_set_02proxy.sh
 create mode 100644 020_jitsi.sh
 create mode 100644 020_shellcheck.sh

diff --git a/001-udev-rules.sh b/001-udev-rules.sh
index e00303a..d3b06a8 100644
--- a/001-udev-rules.sh
+++ b/001-udev-rules.sh
@@ -57,3 +57,11 @@ EOF
 cat > /etc/udev/rules.d/81-thinkpad-dock.rules << 'EOF'
 KERNEL=="dock.0", ACTION=="change", RUN+="/usr/local/sbin/thinkpad-dock.sh"
 EOF
+
+cat > /etc/udev/rules.d/51-android.rules << 'EOF'
+SUBSYSTEM!="usb", GOTO="android_rules_end"
+
+ATTR{idVendor}=="18d1", ATTR{idProduct}=="4ee7", MODE="0666", GROUP="plugdev", SYMLINK+="android_adb", OWNER="default"
+
+LABEL="android_rules_end"
+EOF
diff --git a/001_apt-proxy.sh b/001_apt-proxy.sh
index 1a2c3da..c06296e 100644
--- a/001_apt-proxy.sh
+++ b/001_apt-proxy.sh
@@ -1,4 +1,4 @@
-sudo bash -c 'cat > /etc/apt/apt.conf.d/02proxy' << 'EOF'
+bash -c 'cat > /etc/apt/apt.conf.d/02proxy' << 'EOF'
 Acquire::http { Proxy "http://192.168.1.50:3142"; };
 #Acquire::http { Proxy "http://192.168.1.65:3142"; };
 EOF
diff --git a/001_apt_suggests-recommends.sh b/001_apt_suggests-recommends.sh
index f54b9ae..2a4d7b5 100644
--- a/001_apt_suggests-recommends.sh
+++ b/001_apt_suggests-recommends.sh
@@ -1,24 +1,24 @@
-sudo bash -c "cat > /etc/apt/apt.conf.d/99z_suggests" << 'EOF'
+bash -c "cat > /etc/apt/apt.conf.d/99z_suggests" << 'EOF'
 APT::Install-Suggests "0";
 APT::AutoRemove::SuggestsImportant "false";
 EOF
 
 cat /etc/apt/apt.conf.d/99z_suggests
 
-sudo bash -c "cat > /etc/apt/apt.conf.d/99z_recommends" << 'EOF'
+bash -c "cat > /etc/apt/apt.conf.d/99z_recommends" << 'EOF'
 APT::Install-Recommends "0";
 APT::AutoRemove::RecommendsImportant "false"; 
 EOF
 
 # Keep apt list up to date
-sudo bash -c "cat > /etc/apt/apt.conf.d/10periodic" << 'EOF'
+bash -c "cat > /etc/apt/apt.conf.d/10periodic" << 'EOF'
 APT::Periodic::Update-Package-Lists "1";
 #  APT::Periodic::Download-Upgradeable-Packages "1";
 #  APT::Periodic::Unattended-Upgrade "1";
 EOF
 
 
-#sudo bash -c "cat > /etc/apt/apt.conf.d/02proxy" << 'EOF'
+#bash -c "cat > /etc/apt/apt.conf.d/02proxy" << 'EOF'
 #Acquire::http { Proxy "http://192.168.1.100:3142"; };
 #EOF
 
diff --git a/001_docker_grub-commandline.sh b/001_docker_grub-commandline.sh
index e4be17e..6b4af3f 100644
--- a/001_docker_grub-commandline.sh
+++ b/001_docker_grub-commandline.sh
@@ -1,4 +1,4 @@
 ## Docker likes kernel swappiness support (on reboot)
-#sudo bash -c `perl -p -i -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"/g'  /etc/default/grub`
+#bash -c `perl -p -i -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"/g'  /etc/default/grub`
 
 #Now that your server supports swap limit capabilities in your docker run command you can use --memory-swappiness=0 and set --memory-swap equal to --memory. You also need to set -Des.bootstrap.mlockall=true.
diff --git a/001_prevent_udev_net-rename.sh b/001_prevent_udev_net-rename.sh
index 23a06b6..1887aa8 100644
--- a/001_prevent_udev_net-rename.sh
+++ b/001_prevent_udev_net-rename.sh
@@ -1,5 +1,5 @@
 # prevent renaming of network interfaces by udev
-sudo ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
 
 ## Add this to the /etc/default/grub GRUB_CMDLINE_LINUX_DEFAULT
 sed -i 's,^\(GRUB_CMDLINE_LINUX=\).*,\1'\"snet.ifnames=0\"',' /etc/default/grub
diff --git a/001_resolvconf.sh b/001_resolvconf.sh
index d037f0a..399926f 100644
--- a/001_resolvconf.sh
+++ b/001_resolvconf.sh
@@ -1,4 +1,4 @@
-sudo apt-get -y install --reinstall resolvconf
-sudo mkdir -p /etc/resolvconf/resolv.conf.d/
-sudo bash -c 'echo "nameserver 8.8.8.8" >> /etc/resolvconf/resolv.conf.d/head'
-sudo /etc/init.d/resolvconf reload
+apt-get -y install --reinstall resolvconf
+mkdir -p /etc/resolvconf/resolv.conf.d/
+bash -c 'echo "nameserver 8.8.8.8" >> /etc/resolvconf/resolv.conf.d/head'
+/etc/init.d/resolvconf reload
diff --git a/001_set_02proxy.sh b/001_set_02proxy.sh
new file mode 100644
index 0000000..c27f27e
--- /dev/null
+++ b/001_set_02proxy.sh
@@ -0,0 +1,2 @@
+echo 'Acquire::http { Proxy "http://igm-legal.co.uk:3142"; };' > /etc/apt/apt.conf.d/02proxy
+
diff --git a/001_ssh.sh b/001_ssh.sh
index 3bdd82c..98ac6d7 100644
--- a/001_ssh.sh
+++ b/001_ssh.sh
@@ -1,7 +1,7 @@
-sudo sed -i 's,^\(PasswordAuthentication \).*,\1'yes',' /etc/ssh/sshd_config
-sudo /etc/init.d/ssh restart
+sed -i 's,^\(PasswordAuthentication \).*,\1'yes',' /etc/ssh/sshd_config
+/etc/init.d/ssh restart
 
-sudo bash -c "cat > ~/.ssh/config" <<'EOF'
+bash -c "cat > ~/.ssh/config" <<'EOF'
 Host * 
 Protocol 2 
 TCPKeepAlive yes 
diff --git a/001_system_bell.sh b/001_system_bell.sh
index 10c33ec..e59e06f 100644
--- a/001_system_bell.sh
+++ b/001_system_bell.sh
@@ -8,14 +8,14 @@
 #vbell on
 
 # system console
-#sudo echo "setterm -blength 0" > /etc/profile.d/disable-beep.sh
+#echo "setterm -blength 0" > /etc/profile.d/disable-beep.sh
 
 # X11
 xset b off
 
 # .inputrc
-sudo bash -c `echo "set bell-style visible" > /etc/inputrc`
+bash -c `echo "set bell-style visible" > /etc/inputrc`
 
 #all - /etc/modprobe.d/blacklist
-sudo modprobe -r pcspkr
-sudo bash -c `"echo 'blacklist pcspkr'" >> /etc/modprobe.d/nobeep.conf`
+modprobe -r pcspkr
+bash -c `"echo 'blacklist pcspkr'" >> /etc/modprobe.d/nobeep.conf`
diff --git a/010_alsa.sh b/010_alsa.sh
index ca6915a..2027d57 100644
--- a/010_alsa.sh
+++ b/010_alsa.sh
@@ -1,17 +1,17 @@
-sudo apt-get -y remove --purge pulseaudio pulseaudio-module-x11 pulseaudio-utils pavucontrol gstreamer0.10-pulseaudio paman pavumeter pavucontrol
+apt-get -y remove --purge pulseaudio pulseaudio-module-x11 pulseaudio-utils pavucontrol gstreamer0.10-pulseaudio paman pavumeter pavucontrol
 
-sudo kill -9 `ps aux | grep -v grep | grep start-pulseaudio | awk {'print $2'}`
-sudo kill -9 `ps aux | grep -v grep | grep pulseaudio | awk {'print $2'}`
+kill -9 `ps aux | grep -v grep | grep start-pulseaudio | awk {'print $2'}`
+kill -9 `ps aux | grep -v grep | grep pulseaudio | awk {'print $2'}`
 
-sudo bash -c "rm /etc/asound.conf"
+bash -c "rm /etc/asound.conf"
 rm ~/.pulse-cookie
 rm -r ~/.config/pulse
-sudo rm -rf /tmp/pulse*
+rm -rf /tmp/pulse*
 
-sudo apt-get -y install alsa-base alsa-tools alsa-tools-gui alsa-utils alsa-oss alsamixergui libalsaplayer0
-sudo apt-get -y install pnmixer
+apt-get -y install alsa-base alsa-tools alsa-tools-gui alsa-utils alsa-oss alsamixergui libalsaplayer0
+apt-get -y install pnmixer
 
-sudo /etc/init.d/alsa-utils restart
+/etc/init.d/alsa-utils restart
 
 kill -HUP `ps aux | grep -v grep | grep pnmixer | awk {'print $2'}`
 sed -i 's,^\(VolumeControlCommand=\).*,\1'xfce4-mixer',' ~/.config/pnmixer/config
diff --git a/010_apt-get.sh b/010_apt-get.sh
index cb838bf..90c55d8 100644
--- a/010_apt-get.sh
+++ b/010_apt-get.sh
@@ -1,33 +1,33 @@
-sudo apt-get -y install curl apt-file
-sudo apt-get -y install xclip
-sudo apt-get -y install sshpass
-sudo apt-get -y install git
-sudo apt-get -y install meld
-sudo apt-get -y install gitk
-sudo apt-get -y install zsync
-sudo apt-get -y install jq
-sudo apt-get -y install pv
-sudo apt-get -y install mpv
-sudo apt-get -y install rar
-sudo apt-get -y install inxi
-sudo apt-get -y --force-yes install xmlstarlet
-sudo apt-get -y install hexedit
-sudo apt-get -y install geeqie
-sudo apt-get -y install sshpass
-sudo apt-get -y install wicd-curses
-sudo apt-get -y install htop
-sudo apt-get -y install iotop
-sudo apt-get -y install atril 
-sudo apt-get -y install youtube-dl
-sudo apt-get -y install rox-filer
-sudo apt-get -y install checkinstall
-sudo apt-get -y install ntp ntpdate
-sudo apt-get -y install gstreamer1.0-plugins-ugly gstreamer1.0-plugins-good gstreamer1.0-libav
-sudo apt-get -y install libreoffice-pdfimport 
-sudo apt-get -y install terminology
-sudo apt-get -y install qupzilla
-sudo apt-get -y install firmware-iwlwifi #For thinkpad wifi: Intel 5100 AGN [Shiloh] 
-sudo apt-get install grub-pc grub2 gpart
+apt-get -y install curl apt-file
+apt-get -y install xclip
+apt-get -y install sshpass
+apt-get -y install git
+apt-get -y install meld
+apt-get -y install gitk
+apt-get -y install zsync
+apt-get -y install jq
+apt-get -y install pv
+apt-get -y install mpv
+apt-get -y install rar
+apt-get -y install inxi
+apt-get -y --force-yes install xmlstarlet
+apt-get -y install hexedit
+apt-get -y install geeqie
+apt-get -y install sshpass
+apt-get -y install wicd-curses
+apt-get -y install htop
+apt-get -y install iotop
+apt-get -y install atril 
+apt-get -y install youtube-dl
+apt-get -y install rox-filer
+apt-get -y install checkinstall
+apt-get -y install ntp ntpdate
+apt-get -y install gstreamer1.0-plugins-ugly gstreamer1.0-plugins-good gstreamer1.0-libav
+apt-get -y install libreoffice-pdfimport 
+apt-get -y install terminology
+apt-get -y install qupzilla
+apt-get -y install firmware-iwlwifi #For thinkpad wifi: Intel 5100 AGN [Shiloh] 
+apt-get -y install grub-pc grub2 gpart
 apt-get install -y vim-gtk software-properties-common apt-transport-https wget curl lvm2
 
 
diff --git a/010_salt.sh b/010_salt.sh
index 02e7c5a..855c57f 100644
--- a/010_salt.sh
+++ b/010_salt.sh
@@ -1,4 +1,4 @@
 # Install salt
-sudo bash -c "wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -"
+bash -c "wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -"
 
-sudo apt-get -y install salt-client
+apt-get -y install salt-client
diff --git a/010_saltstack.sh b/010_saltstack.sh
index 23c1689..6b0ced6 100644
--- a/010_saltstack.sh
+++ b/010_saltstack.sh
@@ -5,28 +5,28 @@
 
 # Jessie
 # Pin to minor release
-# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main
 
 # Pin  to major version
-# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/2017.7/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/2017.7/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main
 
 # Pin to latest release
-# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/8/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main
 
 # Stretch
 # Pin to minor release
-# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/archive/2017.7.1/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/archive/2017.7.1/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/9/amd64/archive/2017.7.1 stretch main
 
 # Pin to major version
-# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/2017.7/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/2017.7/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/9/amd64/2017.7 stretch main
 
 # Pin to latest release
-# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+# wget -O - https://repo.saltstack.com/apt/debian/9/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
 # deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main
 
 DEBIAN_VERSION=8
@@ -44,11 +44,11 @@ SALT_VERSION=latest
 REFRESHED_AT=2017-09-31
 
 mkdir -p /etc/apt/sources.list-available
-#sudo bash -c "wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -"
-wget -O - https://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+#bash -c "wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -"
+wget -O - https://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
 
 # NB Packages now have dh-systemd deps and --with-systemd treat as debian upstream
-echo "#wget -O - https://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -" >> /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list
+echo "#wget -O - https://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -" >> /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list
 echo "deb http://repo.saltstack.com/apt/debian/${DEBIAN_VERSION}/amd64/${SALT_VERSION} ${DEBIAN_VERSION} main" > /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list
 #ln -s /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list /etc/apt/sources.list.d/saltstack-${DEBIAN_RELEASE}.list
 
@@ -91,7 +91,7 @@ apt-get install -y -o DPkg::Options::=--force-confold \
 	python-jinja2 \ 
 	python-requests 
 
-sudo apt-get -y install salt-client
+apt-get -y install salt-client
 
 # Salt-master
 apt-get install -yq -o -o DPkg::Options::=--force-confold --no-install-recommends \
diff --git a/010_sysctl.sh b/010_sysctl.sh
index 6491a5d..1ee5ff9 100644
--- a/010_sysctl.sh
+++ b/010_sysctl.sh
@@ -7,7 +7,7 @@
 # vfs_cache_pressure -  value larger than 100 may negative performance impact:
 # https://www.kernel.org/doc/Documentation/sysctl/vm.txt
 
-#sudo sysctl -a | grep dirty
+#sysctl -a | grep dirty
 # vm.dirty_background_bytes = 0
 # vm.dirty_background_ratio = 10
 # vm.dirty_bytes = 0
@@ -16,12 +16,12 @@
 # vm.dirty_writeback_centisecs = 500
 # vm.dirtytime_expire_seconds = 43200
 
-#sudo sysctl -a | grep ...
+#sysctl -a | grep ...
 # vm.swappiness = 60
 # vm.vfs_cache_pressure = 100
 # vm.max_map_count = 65530
 
-#sudo sysctl -a | grep overcommit
+#sysctl -a | grep overcommit
 # vm.overcommit_kbytes = 0
 # vm.overcommit_memory = 0
 # vm.overcommit_ratio = 50
diff --git a/020_arduino.sh b/020_arduino.sh
index 685e22a..8bbbc21 100644
--- a/020_arduino.sh
+++ b/020_arduino.sh
@@ -6,8 +6,8 @@ wget -c https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz &
 	cd /opt && \
 	tar xf /var/tmp/arduino-${ARDUINO_VERSION}-linux64.tar.xz
 
-sudo usermod -a -G dialout $USER && \
-sudo apt-get install git python-serial
+usermod -a -G dialout $USER && \
+apt-get install git python-serial
 
 mkdir -p ~/Arduino/hardware/espressif && \
 	cd ~/Arduino/hardware/espressif && \
diff --git a/020_chrome-browser.sh b/020_chrome-browser.sh
index 2f48d84..3c87f8e 100644
--- a/020_chrome-browser.sh
+++ b/020_chrome-browser.sh
@@ -12,7 +12,7 @@ apt-get clean
 #update-alternatives: using /usr/bin/google-chrome-stable to provide /usr/bin/gnome-www-browser (gnome-www-browser) in auto mode
 #update-alternatives: using /usr/bin/google-chrome-stable to provide /usr/bin/google-chrome (google-chrome) in auto mode
 
-#sudo update-alternatives --query x-www-browser
+#update-alternatives --query x-www-browser
 # 
 #Name: x-www-browser
 #Link: /usr/bin/x-www-browser
@@ -55,7 +55,7 @@ rm -rf /etc/apt/sources.list.d/google-chrome.list
 
 mkdir -p /etc/apt/sources.list-available
 cat > /etc/apt/sources.list-available/google-chrome-stable.list << EOF 
-# wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+# wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
 deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main
 EOF
 
diff --git a/020_conky.sh b/020_conky.sh
index 26d0025..b1320cf 100644
--- a/020_conky.sh
+++ b/020_conky.sh
@@ -1,4 +1,4 @@
-sudo apt-get -y install conky-all
+apt-get -y install conky-all
 
 
 mkdir -p ~/.conkyrc.d
diff --git a/020_docker.sh b/020_docker.sh
index 0b3801d..6c1ca39 100644
--- a/020_docker.sh
+++ b/020_docker.sh
@@ -1,25 +1,25 @@
 # Install docker
 set -x 
-echo '#sudo bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"' >  /etc/apt/sources.list.d/docker.list
+echo '#bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"' >  /etc/apt/sources.list.d/docker.list
 echo "deb http://apt.dockerproject.org/repo debian-jessie main" >> /etc/apt/sources.list.d/docker.list 
 
-sudo bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
-sudo apt-get update
-sudo apt-get -y install -q --no-install-recommends curl ca-certificates
-sudo apt-get -y install --force-yes docker-engine
-#sudo apt-get install -y --force-yes docker-engine=1.9.1-0~jessie
+bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
+apt-get update
+apt-get -y install -q --no-install-recommends curl ca-certificates
+apt-get -y install --force-yes docker-engine
+#apt-get install -y --force-yes docker-engine=1.9.1-0~jessie
 
-#sudo mkdir -p /var/lib/docker
-#sudo umount /dev/mapper/vg_prime-varLibDockerLV 
-#sudo mount /dev/mapper/vg_prime-varLibDockerLV /var/lib/docker
+#mkdir -p /var/lib/docker
+#umount /dev/mapper/vg_prime-varLibDockerLV 
+#mount /dev/mapper/vg_prime-varLibDockerLV /var/lib/docker
 
-sudo bash -c 'perl -p -i -e "s/#DOCKER_OPTS=\"\"/DOCKER_OPTS=\"--restart=true\"/g"  /etc/default/docker'
-sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --storage-driver=zfs\"|" /etc/default/docker'
-sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --dns 8.8.8.8 --dns 8.8.4.4\"|" /etc/default/docker'
-sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 zfs.fsname=rpool/docker\"|" /etc/default/docker'
+bash -c 'perl -p -i -e "s/#DOCKER_OPTS=\"\"/DOCKER_OPTS=\"--restart=true\"/g"  /etc/default/docker'
+bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --storage-driver=zfs\"|" /etc/default/docker'
+bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --dns 8.8.8.8 --dns 8.8.4.4\"|" /etc/default/docker'
+bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 zfs.fsname=rpool/docker\"|" /etc/default/docker'
 
 # i2p container requires ipv6 
-sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --ipv6\"|" /etc/default/docker'
+bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --ipv6\"|" /etc/default/docker'
 
 # The above can also be passed in /etc/docker/daemon.json
 # For other options:
@@ -35,7 +35,8 @@ fi
 
 DOCKER_OPT[0]='.["dns"] = ["8.8.8.8","8.8.4.4"]'
 DOCKER_OPT[1]='.["storage-driver"] = "zfs"'
-DOCKER_OPT[2]='.["storage-opts"] = ["zfs.fsname=rpool/docker","size=256"]'
+#DOCKER_OPT[2]='.["storage-opts"] = ["zfs.fsname=rpool/docker","size=256"]'
+DOCKER_OPT[2]='.["storage-opts"] = ["zfs.fsname=rpool/docker"]'
 
 for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
 	OPTION="${DOCKER_OPT[$i]}"
@@ -87,8 +88,13 @@ done
 #		mv -b /tmp/daemon.json.new /etc/docker/daemon.json
 #done
 
-sudo /etc/init.d/docker restart
-#sudo dpkg -i /var/tmp/docker-compose/docker-compose_1.11.0-1_amd64.deb 
+groupadd docker
+#usermod -aG docker $USER
+gpasswd -a $USER docker
+newgrp docker
+
+/etc/init.d/docker restart
+#dpkg -i /var/tmp/docker-compose/docker-compose_1.11.0-1_amd64.deb 
 
 LATEST_URL=$(curl -s https://api.github.com/repos/docker/compose/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep docker-compose-$(uname -s)-$(uname -m))
 RELEASE=$(echo ${LATEST_URL} | awk '{split($0,a,"/"); print a[8]}')
@@ -115,7 +121,7 @@ BASE_TMP_DIR=~/tmptmp/checkinstall_tmp
 mkdir -p ${BASE_TMP_DIR}
 
 # do your work
-sudo checkinstall -y --fstrans \
+checkinstall -y --fstrans \
 	--pkgname=docker-compose \
 	--pkgversion=${RELEASE} \
 	--pkgrelease=1 \
@@ -135,4 +141,4 @@ set +x
 curl -o /usr/local/bin/docker-compose -L https://api.github.com/repos/docker/compose/releases/latest && chmod +x /usr/local/bin/docker-compose
 EOF
 
-sudo bash ./checkinstall_it.sh
+bash ./checkinstall_it.sh
diff --git a/020_firmware.sh b/020_firmware.sh
index 10e6d2c..5bd7141 100644
--- a/020_firmware.sh
+++ b/020_firmware.sh
@@ -1,5 +1,5 @@
-sudo apt-get install linux-firmware
-sudo apt-get install firmware-linux
-sudo apt-get install firmware-linux-free
-sudo apt-get install firmware-linux-nonfree
-sudo apt-get install firmware-misc-nonfree
+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
diff --git a/020_fish.sh b/020_fish.sh
index 02d4760..425bef5 100644
--- a/020_fish.sh
+++ b/020_fish.sh
@@ -1,5 +1,5 @@
 # Install fish
-sudo apt-get install -y fish 
+apt-get install -y fish 
 mkdir -p ~/.config/fish
 # wget -c --directory-prefix ~/.config/fish https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/fish/config.fish 
 
diff --git a/020_fossamail.sh b/020_fossamail.sh
index 39b7ffe..17043d1 100644
--- a/020_fossamail.sh
+++ b/020_fossamail.sh
@@ -6,13 +6,13 @@ FOSSAMAIL_VERSION=38.0.0
 FOSSAMAIL_FILENAME=FossaMail-${FOSSAMAIL_VERSION}.linux-x86_64.tar.bz2
 
 wget -c --directory-prefix /var/tmp http://relmirror.fossamail.org/${FOSSAMAIL_VERSION}/${FOSSAMAIL_FILENAME}
-sudo rm -rf /opt/Fossamail-old
-sudo mv /opt/FossaMail /opt/FossaMail-old
-sudo tar -xjvf /var/tmp/${FOSSAMAIL_FILENAME} -C /opt
+rm -rf /opt/Fossamail-old
+mv /opt/FossaMail /opt/FossaMail-old
+tar -xjvf /var/tmp/${FOSSAMAIL_FILENAME} -C /opt
 
-#sudo git clone -b 25.1_RelBranch -single-branch https://github.com/MoonchildProductions/FossaMail /opt/FossaMail
+#git clone -b 25.1_RelBranch -single-branch https://github.com/MoonchildProductions/FossaMail /opt/FossaMail
 
-sudo bash -c "cat > /usr/share/applications/fossamail.desktop" <<'EOF'
+bash -c "cat > /usr/share/applications/fossamail.desktop" <<'EOF'
 [Desktop Entry]
 Encoding=UTF-8
 Name=Fossamail
@@ -38,7 +38,7 @@ EOF
 # NOW INTEGRATED Fossamail lightning plugin
 #LIGHTNING_VERSION=${FOSSAMAIL_VERSION}
 #wget -c --directory-prefix /var/tmp http://relmirror.fossamail.org/${LIGHTNING_VERSION}/lightning-${LIGHTNING_VERSION}.en-US.linux-x86_64.xpi
-#sudo gunzip /var/tmp/lightning-25.1.9.en-US.linux-x86_64.xpi.gz
+#gunzip /var/tmp/lightning-25.1.9.en-US.linux-x86_64.xpi.gz
 #/opt/FossaMail/FossaMail -install-global-extension lightning-${LIGHTNING_VERSION}.en-US.linux-x86_64.xpi
 
 
diff --git a/020_free42.sh b/020_free42.sh
index 848a0bc..cf8b75a 100644
--- a/020_free42.sh
+++ b/020_free42.sh
@@ -1,4 +1,4 @@
-sudo apt-get -y install free42-nologo
+apt-get -y install free42-nologo
 mkdir -p ~/.free42/
 touch ~/.free42/print
 touch ~/.free42/state
diff --git a/020_hexchat.sh b/020_hexchat.sh
index fcce57c..09779ca 100644
--- a/020_hexchat.sh
+++ b/020_hexchat.sh
@@ -1,4 +1,4 @@
-sudo apt-get -y install hexchat
+apt-get -y install hexchat
 mkdir -p ~/.config/hexchat
 cat > ~/.config/hexchat/chanopt.conf <<'EOF'
 network = freenode
diff --git a/020_iridiumbrowser.sh b/020_iridiumbrowser.sh
index 929cf41..56ff6bd 100644
--- a/020_iridiumbrowser.sh
+++ b/020_iridiumbrowser.sh
@@ -1,7 +1,7 @@
-wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
+wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|apt-key add -
 
-cat <<EOF | sudo tee /etc/apt/sources.list-available/iridium-browser.list
-# wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
+cat <<EOF | tee /etc/apt/sources.list-available/iridium-browser.list
+# wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|apt-key add -
 deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main
 #deb-src https://downloads.iridiumbrowser.de/deb/ stable main
 EOF
diff --git a/020_jitsi.sh b/020_jitsi.sh
new file mode 100644
index 0000000..9bf2213
--- /dev/null
+++ b/020_jitsi.sh
@@ -0,0 +1,41 @@
+cat > /etc/apt/sources.list-available/jitsi-unstable.list << 'EOF'
+ # wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
+deb http://download.jitsi.org/deb stable/
+EOF
+
+cat > /etc/apt/sources.list-available/jitsi-unstable.list << 'EOF'
+ # wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
+deb http://download.jitsi.org/deb testing/
+EOF
+
+# Nightly
+cat > /etc/apt/sources.list-available/jitsi-unstable.list << 'EOF'
+ # wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
+deb http://download.jitsi.org/deb unstable/
+EOF
+
+ln -s /etc/apt/sources.list-available/jitsi-unstable.list /etc/apt/sources.list.d/jitsi-unstable.list
+
+wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
+
+# Update your package list:
+
+apt-get -y update
+
+# Install the full suite:
+
+apt-get -y install 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
+
diff --git a/020_lxc.sh b/020_lxc.sh
index 3c9eb2c..78905b3 100644
--- a/020_lxc.sh
+++ b/020_lxc.sh
@@ -59,7 +59,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 #those in alphabetical order.
 
 # Needed for live migrate
-sudo apt-get install criu
+apt-get install criu
 
 ## then you can:
 # lxc launch ubuntu $somename
diff --git a/020_neovim.sh b/020_neovim.sh
index 91bdf1e..6e1962a 100644
--- a/020_neovim.sh
+++ b/020_neovim.sh
@@ -1,7 +1,10 @@
 # Install Neovim
-sudo apt-get install software-properties-common -y
-sudo apt-get install python-software-properties -y
-sudo apt-get install -y neovim #python-neovim python3-neovim
+apt-get install software-properties-common -y
+apt-get install python-software-properties -y
+apt-get install -y neovim 
+
+# Need to backport from sid
+apt-get install -y #python-neovim python3-neovim
 
 # python-neovim if notavailableasapackage
 pip2 install --user --upgrade neovim
@@ -428,9 +431,9 @@ let g:bufExplorerFindActive=0
 EOF
 
 # Only if you want to replace vim 
-#sudo update-alternatives --install /usr/bin/vi vi /usr/bin/nvim 60
-#sudo update-alternatives --config vi
-#sudo update-alternatives --install /usr/bin/vim vim /usr/bin/nvim 60
-#sudo update-alternatives --config vim
-#sudo update-alternatives --install /usr/bin/editor editor /usr/bin/nvim 60
-#sudo update-alternatives --config editor
+#update-alternatives --install /usr/bin/vi vi /usr/bin/nvim 60
+#update-alternatives --config vi
+#update-alternatives --install /usr/bin/vim vim /usr/bin/nvim 60
+#update-alternatives --config vim
+#update-alternatives --install /usr/bin/editor editor /usr/bin/nvim 60
+#update-alternatives --config editor
diff --git a/020_palemoon.sh b/020_palemoon.sh
index 932fa02..73168d7 100644
--- a/020_palemoon.sh
+++ b/020_palemoon.sh
@@ -9,16 +9,16 @@
 PALEMOON_VERSION=27.5.0
 PALEMOON_HOME=/opt
 wget -c --directory-prefix /var/tmp http://linux.palemoon.org/files/${PALEMOON_VERSION}/palemoon-${PALEMOON_VERSION}.en-US.linux-x86_64.tar.bz2
-sudo tar -xjvf /var/tmp/palemoon-${PALEMOON_VERSION}.en-US.linux-x86_64.tar.bz2 -C ${PALEMOON_HOME}
-sudo ln -sf ${PALEMOON_HOME}/palemoon/palemoon /usr/bin/palemoon
+tar -xjvf /var/tmp/palemoon-${PALEMOON_VERSION}.en-US.linux-x86_64.tar.bz2 -C ${PALEMOON_HOME}
+ln -sf ${PALEMOON_HOME}/palemoon/palemoon /usr/bin/palemoon
 
-sudo ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default16.png /usr/share/icons/hicolor/16x16/apps/palemoon.png
-sudo ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default32.png /usr/share/icons/hicolor/32x32/apps/palemoon.png
-sudo ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default48.png /usr/share/icons/hicolor/48x48/apps/palemoon.png
-sudo ln -sf ${PALEMOON_HOME}/palemoon/browser/icons/mozicon128.png /usr/share/icons/hicolor/128x128/apps/palemoon.png
-sudo update-alternatives --install /usr/bin/gnome-www-browser gnome-www-browser /usr/bin/palemoon 100
+ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default16.png /usr/share/icons/hicolor/16x16/apps/palemoon.png
+ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default32.png /usr/share/icons/hicolor/32x32/apps/palemoon.png
+ln -sf ${PALEMOON_HOME}/palemoon/browser/chrome/icons/default/default48.png /usr/share/icons/hicolor/48x48/apps/palemoon.png
+ln -sf ${PALEMOON_HOME}/palemoon/browser/icons/mozicon128.png /usr/share/icons/hicolor/128x128/apps/palemoon.png
+update-alternatives --install /usr/bin/gnome-www-browser gnome-www-browser /usr/bin/palemoon 100
 
-sudo bash -c "cat > /usr/share/applications/palemoon.desktop" <<'EOF'
+bash -c "cat > /usr/share/applications/palemoon.desktop" <<'EOF'
 [Desktop Entry]
 Version=1.0
 Name=Pale Moon Web Browser
diff --git a/020_pidgin.sh b/020_pidgin.sh
index 37d0b29..55cb3a0 100644
--- a/020_pidgin.sh
+++ b/020_pidgin.sh
@@ -1 +1 @@
-sudo apt-get install -y pidgin pidgin-otr pidgin-libnotify
+apt-get install -y pidgin pidgin-otr pidgin-libnotify
diff --git a/020_pycharm-install.sh b/020_pycharm-install.sh
index c82489a..97c92a8 100644
--- a/020_pycharm-install.sh
+++ b/020_pycharm-install.sh
@@ -27,6 +27,6 @@
 #EOF
 #EF
 
-echo 'checkinstall -y --fstrans=no --install=no bash ./install_pycharm.sh 2>&1 | tee err' > checkinstall_pycharm.sh && sudo bash ./checkinstall_pycharm.sh
-sudo dpkg -i /var/tmp/pycharm-community-${PYCHARM_VERSION}/pycharm-community_${PYCHARM_VERSION}-1_amd64.deb
+echo 'checkinstall -y --fstrans=no --install=no bash ./install_pycharm.sh 2>&1 | tee err' > checkinstall_pycharm.sh && bash ./checkinstall_pycharm.sh
+dpkg -i /var/tmp/pycharm-community-${PYCHARM_VERSION}/pycharm-community_${PYCHARM_VERSION}-1_amd64.deb
 
diff --git a/020_redshift.sh b/020_redshift.sh
index adf76af..c5ae872 100644
--- a/020_redshift.sh
+++ b/020_redshift.sh
@@ -1,4 +1,4 @@
-sudo apt-get -y install redshift
+apt-get -y install redshift
 
 /usr/bin/xfconf-query -c xfce4-session -p /startup/redshift/enabled -n -t bool -s true
 
diff --git a/020_refracta-tools.sh b/020_refracta-tools.sh
index 21c0007..9c6c450 100644
--- a/020_refracta-tools.sh
+++ b/020_refracta-tools.sh
@@ -39,4 +39,4 @@ URL_LIST=( \
 #for URL in ${URL_LIST[*]}; do printf "   %s\n" ${URL##*/}; done
 for URL in ${URL_LIST[*]}; do printf ${URL}; wget -c ${URL} && dpkg -i ./${URL##*/}; done
 
-sudo apt-get -y -f install
+apt-get -y -f install
diff --git a/020_rox-filer.sh b/020_rox-filer.sh
index 09b063f..4c977f0 100644
--- a/020_rox-filer.sh
+++ b/020_rox-filer.sh
@@ -1,6 +1,6 @@
 # ROX-Filer settings
-sudo apt-get -y install rox-filer
-sudo apt-get -y install xmlstarlet
+apt-get -y install rox-filer
+apt-get -y install xmlstarlet
 
 # Options
 # The Options and menus2 file are not created until first run
diff --git a/020_shellcheck.sh b/020_shellcheck.sh
new file mode 100644
index 0000000..9344211
--- /dev/null
+++ b/020_shellcheck.sh
@@ -0,0 +1,24 @@
+apt-get install shellcheck
+
+#apt-get install cabal-install
+#
+#cabal update
+#
+#cabal install shellcheck
+#
+#ln -s ~/.cabal/bin/shellcheck ~/bin/shellcheck
+#
+#EXCLUDE_CODE_LIST="SC1090,SC1091,SC2154,SC2001,SC2002"
+#
+#echo > <<"EOF"
+## Run test excluding certain rules
+#EXCLUDE_CODE_LIST=${EXCLUDE_CODE_LIST}
+#shellcheck -e $EXCLUDE_CODE_LIST $file
+#EOF
+#
+#echo > <<"EOF"
+## Run test against all scripts under a folder
+#EXCLUDE_CODE_LIST=${EXCLUDE_CODE_LIST}
+#find . -name "*.sh" | xargs \
+#    shellcheck -e $EXCLUDE_CODE_LIST $file
+#EOF
diff --git a/020_tilda.sh b/020_tilda.sh
index 384e87d..6f62feb 100644
--- a/020_tilda.sh
+++ b/020_tilda.sh
@@ -1,9 +1,9 @@
 
-sudo apt-get -y remove --purge guake
-sudo kill -9 `ps aux | grep -v grep | grep guake | awk {'print $2'}`
+apt-get -y remove --purge guake
+kill -9 `ps aux | grep -v grep | grep guake | awk {'print $2'}`
 #kill -HUP `ps aux |grep -v grep |grep /usr/bin/guake |awk {'print $2'}`
 
-sudo apt-get -y install tilda
+apt-get -y install tilda
 
 mkdir -p ~/.config/autostart
 cat > ~/.config/autostart/tilda.desktop <<'EOF'
diff --git a/020_unetbootin.sh b/020_unetbootin.sh
index 8512985..e743f76 100644
--- a/020_unetbootin.sh
+++ b/020_unetbootin.sh
@@ -1,8 +1,8 @@
 # https://unetbootin.github.io/linux_download.html
 
-#sudo add-apt-repository ppa:gezakovacs/ppa
-#sudo apt-get update
-#sudo apt-get install unetbootin
+#add-apt-repository ppa:gezakovacs/ppa
+#apt-get update
+#apt-get install unetbootin
 
 cd /var/tmp
 wget -c https://github.com/unetbootin/unetbootin/releases/download/655/unetbootin-linux64-655.bin
diff --git a/020_vim.sh b/020_vim.sh
index e9a856a..d530529 100644
--- a/020_vim.sh
+++ b/020_vim.sh
@@ -1,8 +1,8 @@
 set +x
-#sudo apt-get install vim-gtk
+#apt-get install vim-gtk
 
-sudo sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc
-sudo sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc
+sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc
+sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc
 
 # Macros
 # Format json
@@ -172,6 +172,9 @@ Plugin 'klen/python-mode'
 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/nerdcommenter'
 
+Plugin 'luochen1990/rainbow'
+let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle
+
 " FZF 
 set rtp+=~/.fzf
 Plugin 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all'  }
diff --git a/020_zsh.sh b/020_zsh.sh
index 830f0d4..7580c6b 100644
--- a/020_zsh.sh
+++ b/020_zsh.sh
@@ -1,17 +1,17 @@
-sudo apt-get -y install zsh nodejs-legacy
+apt-get -y install zsh nodejs-legacy
 
 # compaudit
 # There are insecure directories: /usr/local/share/zsh/site-functions
-# compaudit | xargs sudo chmod g-w
+# compaudit | xargs chmod g-w
 # compaudit 2>&1 | sed -n '1d; p'
  
-sudo mkdir -p /usr/local/share/zsh/site-functions
-sudo chmod g-w /usr/local/share/zsh/site-functions
+mkdir -p /usr/local/share/zsh/site-functions
+chmod g-w /usr/local/share/zsh/site-functions
 
 cd ~
-sudo chsh -s $(which zsh) ${USER}
+chsh -s $(which zsh) ${USER}
 
-sudo apt-get install -y git
+apt-get 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/unixorn/zsh-quickstart-kit # FIXME: needs to be packaged
@@ -184,7 +184,7 @@ echo '# Use unset 'QUICKSTART_KIT_REFRESH_IN_DAYS' to disable.' > ~/.zshrc.d/001
 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
 
-sudo apt-get install -y fonts-powerline powerline
+apt-get 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 473c67e..f713163 100644
--- a/025_festival-voices.sh
+++ b/025_festival-voices.sh
@@ -1 +1 @@
-sudo apt-get -y install --force-yes festvox-rablpc16k festival 
+apt-get -y install --force-yes festvox-rablpc16k festival 
diff --git a/025_firefox-extensions.sh b/025_firefox-extensions.sh
index c849171..4e14d43 100644
--- a/025_firefox-extensions.sh
+++ b/025_firefox-extensions.sh
@@ -1,9 +1,9 @@
-sudo apt-get -y install mozilla-devscripts
-sudo apt-get -y install xul-ext-webdeveloper
-sudo apt-get -y install xul-ext-itsalltext
-sudo apt-get -y install xul-ext-greasemonkey 
-sudo apt-get -y install xul-ext-firebug 
-sudo apt-get -y install xul-ext-firexpath 
+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 
 
 # See https://www.legroom.net/howto/firefox
 #user_pref("privacy.trackingprotection.enabled "true");
@@ -33,7 +33,7 @@ sudo apt-get -y install xul-ext-firexpath
 #)
 
 # debian still uses the localstore.rdf store. Probably not firefox-esr FIXME
-sudo bash -c "cat > /etc/iceweasel/profile/xulstore.json" <<'EOF'
+bash -c "cat > /etc/iceweasel/profile/xulstore.json" <<'EOF'
 {
     "about:config": {
         "lockCol": {
@@ -116,7 +116,7 @@ EOF
 # Change firefox/iceweasel preferences in /home and /etc prefs.js
 ## firefox pref value - sets the value of the given user_pref to value variable
 #value=2
-#sudo for i in "browser.startup.page"
+#for i in "browser.startup.page"
 #do
 #    if grep $i /etc/iceweasel/profile/prefs.js
 #    then
@@ -131,7 +131,7 @@ EOF
 #done
 #
 ## firefox pref true - sets the value of the given user_pref to true
-#sudo for i in "privacy.trackingprotection.enabled"
+#for i in "privacy.trackingprotection.enabled"
 #do
 #    print $1
 #    if grep $i /etc/iceweasel/profile/prefs.js
@@ -145,7 +145,7 @@ EOF
 #done
 #
 ## firefox pref clear - sets the value of the given user_pref to empty
-#sudo for i in "browser.newtabpage.directory.ping" "browser.newtabpage.directory.source" "browser.fixup.alternate.suffix"
+#for i in "browser.newtabpage.directory.ping" "browser.newtabpage.directory.source" "browser.fixup.alternate.suffix"
 #do
 #    print $1
 #    if grep $i /etc/iceweasel/profile/prefs.js
@@ -162,7 +162,7 @@ EOF
 #
 #PROFILE_DIR="~/.mozilla/firefox/${PROFILE_NAME}"
 # 
-#sudo for i in "browser.pocket.enabled"
+#for i in "browser.pocket.enabled"
 #do
 #    print $1
 #    if grep $i ${PROFILE_DIR}/prefs.js
@@ -179,7 +179,7 @@ EOF
 #
 #PROFILE_DIR="~/.mozilla/firefox/${PROFILE_NAME}"
 # 
-#sudo for i in "network.http.speculative-parallel-limit"
+#for i in "network.http.speculative-parallel-limit"
 #do
 #    print $1
 #    if grep $i ${PROFILE_DIR}/prefs.js
@@ -284,11 +284,11 @@ do
 	mv ${EXTENSIONS_DIR}/${EXTENSION_NAME} ${ID}
 	mkdir -p /var/tmp/extensions
         mkdir -p  ~/.mozilla/extensions/ 
-	sudo cp -a ${ID} /usr/share/xul-ext/
+	cp -a ${ID} /usr/share/xul-ext/
         #cp -a ${ID} ~/.mozilla/extensions/ 
 	#cp -a ${ID} /var/tmp/extensions/
-	#sudo cp -a ${ID} /usr/lib/iceweasel/extensions/
-	#sudo cp -a ${ID} /usr/share/mozilla/extensions/
+	#cp -a ${ID} /usr/lib/iceweasel/extensions/
+	#cp -a ${ID} /usr/share/mozilla/extensions/
         #cp -a ${ID} ~/.moonchild productions/pale moon/*.default/extensions
 	COUNTER=$((COUNTER + 1))
 	echo ${COUNTER}
@@ -300,7 +300,7 @@ done
 # FIXME xulstore.json location needs fixing.
 # toolbar-menubar 
 # PersonalToolbar
-sudo bash -c "cat > xulstore.json" <<'EOF'
+bash -c "cat > xulstore.json" <<'EOF'
 {
     "chrome://browser/content/browser.xul": {
         "PersonalToolbar": {
diff --git a/025_remove-fossamail.sh b/025_remove-fossamail.sh
index 5e356f8..cac32a8 100644
--- a/025_remove-fossamail.sh
+++ b/025_remove-fossamail.sh
@@ -1,2 +1,2 @@
-sudo rm -rf /usr/share/applications/fossamail.desktop
-sudo rm -rf /opt/FossaMail*
+rm -rf /usr/share/applications/fossamail.desktop
+rm -rf /opt/FossaMail*
diff --git a/025_thunderbird-extensions.sh b/025_thunderbird-extensions.sh
index 7215a0e..2d4de1b 100644
--- a/025_thunderbird-extensions.sh
+++ b/025_thunderbird-extensions.sh
@@ -1,6 +1,6 @@
 # thunderbird/icedove extensions
-#sudo apt-get -y install xul-ext-tbdialout 
+#apt-get -y install xul-ext-tbdialout 
 # https://doc.owncloud.org/server/5.0/user_manual/pim/sync_thunderbird.html
-#sudo apt-get -y install xul-ext-sogo-connector 
-sudo apt-get -y install xul-ext-firetray 
-#sudo apt-get -y install iceowl-extension
+#apt-get -y install xul-ext-sogo-connector 
+apt-get -y install xul-ext-firetray 
+#apt-get -y install iceowl-extension
diff --git a/025_xfce4-settings.sh b/025_xfce4-settings.sh
index dbc4758..76759ff 100644
--- a/025_xfce4-settings.sh
+++ b/025_xfce4-settings.sh
@@ -40,8 +40,8 @@ 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
-sudo apt-get -y  remove xfce4-xkb-plugin 
-sudo killall -HUP $(ps aux | grep -v grep | grep xfce4-xkb-plugin | awk {'print $2'})
+apt-get -y  remove 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/025_xfce4-theme-fix.sh b/025_xfce4-theme-fix.sh
index 18609b0..8427d38 100644
--- a/025_xfce4-theme-fix.sh
+++ b/025_xfce4-theme-fix.sh
@@ -4,9 +4,9 @@
 
 themes_home=/usr/share/themes
 theme_name=Greybird
-#sudo cp -a $theme_home/$theme_name/ $theme_home/$theme_name-old
+#cp -a $theme_home/$theme_name/ $theme_home/$theme_name-old
 #
-#sudo bash -c "cat > $themes_home/$theme_name/left-inactive.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/left-inactive.xpm" <<'EOF'
 #/* XPM */
 #static char * left_inactive_xpm[] = {
 #"3 21 2 1",
@@ -34,7 +34,7 @@ theme_name=Greybird
 #"...",
 #"..."};#EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/left-active.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/left-active.xpm" <<'EOF'
 #/* XPM */
 #static char * left_active_xpm[] = {
 #"3 21 2 1",
@@ -62,7 +62,7 @@ theme_name=Greybird
 #"...",
 #"..."};#EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/right-active.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/right-active.xpm" <<'EOF'
 #/* XPM */
 #static char * right_active_xpm[] = {
 #"4 24 2 1",
@@ -94,7 +94,7 @@ theme_name=Greybird
 #"...x"};
 #EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-inactive.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-inactive.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_inactive_xpm[] = {
 #"8 3 2 1",
@@ -105,7 +105,7 @@ theme_name=Greybird
 #"........................"};
 #EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-active.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-active.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_active_xpm[] = {
 #"8 3 2 1",
@@ -116,7 +116,7 @@ theme_name=Greybird
 #"........................"};
 #EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-left-inactive.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-left-inactive.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_left_inactive_xpm[] = {
 #"16 16 2 1",
@@ -140,7 +140,7 @@ theme_name=Greybird
 #" ..............."};
 #EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-left-active.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-left-active.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_left_active_xpm[] = {
 #"16 16 2 1",
@@ -164,7 +164,7 @@ theme_name=Greybird
 #" ..............."};
 #EOF
 #
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-right-inactive.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-right-inactive.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_right_inactive_xpm[] = {
 #"16 16 2 1",
@@ -188,7 +188,7 @@ theme_name=Greybird
 #"............... "};
 #EOF
 
-#sudo bash -c "cat > $themes_home/$theme_name/bottom-right-active.xpm" <<'EOF'
+#bash -c "cat > $themes_home/$theme_name/bottom-right-active.xpm" <<'EOF'
 #/* XPM */
 #static char * bottom_right_active_xpm[] = {
 #"16 16 2 1",
@@ -213,25 +213,25 @@ theme_name=Greybird
 #EOF
 
 # Create copy of Greybird
-sudo cp -r   ${themes_home}/${theme_name}   ${themes_home}/${theme_name}-thick
+cp -r   ${themes_home}/${theme_name}   ${themes_home}/${theme_name}-thick
 
 # copy borders from Daloa to new theme
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-active.xpm          ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-inactive.xpm        ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/left-active.xpm            ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/left-inactive.xpm          ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/right-active.xpm           ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/right-inactive.xpm         ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-left-active.xpm     ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-left-inactive.xpm   ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-right-active.xpm    ${themes_home}/${theme_name}-thick/xfwm4/
-sudo cp ${themes_home}/Daloa/xfwm4/bottom-right-inactive.xpm  ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-active.xpm          ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-inactive.xpm        ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/left-active.xpm            ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/left-inactive.xpm          ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/right-active.xpm           ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/right-inactive.xpm         ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-left-active.xpm     ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-left-inactive.xpm   ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-right-active.xpm    ${themes_home}/${theme_name}-thick/xfwm4/
+cp ${themes_home}/Daloa/xfwm4/bottom-right-inactive.xpm  ${themes_home}/${theme_name}-thick/xfwm4/
 
 # Find/Replace the colors in the new theme with grey colors
-sudo sed -i -e 's/C0C0C0/CECECE/'  $themes_home/${theme_name}-thick/xfwm4/*
-sudo sed -i -e 's/A0A0FF/7C7C7C/'  $themes_home/${theme_name}-thick/xfwm4/*
-sudo sed -i -e 's/E0E0FF/E0E0E0/'  $themes_home/${theme_name}-thick/xfwm4/*
+sed -i -e 's/C0C0C0/CECECE/'  $themes_home/${theme_name}-thick/xfwm4/*
+sed -i -e 's/A0A0FF/7C7C7C/'  $themes_home/${theme_name}-thick/xfwm4/*
+sed -i -e 's/E0E0FF/E0E0E0/'  $themes_home/${theme_name}-thick/xfwm4/*
 
 xfconf-query -c xsettings -p /Net/ThemeName -s "Greybird-thick"
 
-sudo xfwm4 --replace &
+xfwm4 --replace &
diff --git a/050_remove_avahi.sh b/050_remove_avahi.sh
index 6135966..13ed697 100644
--- a/050_remove_avahi.sh
+++ b/050_remove_avahi.sh
@@ -1,6 +1,6 @@
 # removing any more of avahi need rebuilding of libpurple libgnomevfs libgnome2
-sudo bash -c "update-rc.d avahi-daemon disable"
-sudo apt-get -y remove --purge cups-browsed
-sudo apt-get -y remove --purge avahi-autoipd libavahi-common-data libavahi-common3 avahi-daemon libavahi-glib1 libavahi-client3
+bash -c "update-rc.d avahi-daemon disable"
+apt-get -y remove --purge cups-browsed
+apt-get -y remove --purge avahi-autoipd libavahi-common-data libavahi-common3 avahi-daemon libavahi-glib1 libavahi-client3
 
 
diff --git a/050_remove_flash.sh b/050_remove_flash.sh
index b546af0..e878083 100644
--- a/050_remove_flash.sh
+++ b/050_remove_flash.sh
@@ -1 +1 @@
-sudo apt-get -y remove --purge flashplugin-nonfree
+apt-get -y remove --purge flashplugin-nonfree
diff --git a/050_remove_gnome-keyring.sh b/050_remove_gnome-keyring.sh
index 70c3758..7fc47fa 100644
--- a/050_remove_gnome-keyring.sh
+++ b/050_remove_gnome-keyring.sh
@@ -1,2 +1,2 @@
-sudo apt-get -y remove gnome-keyring
-sudo apt-get -y remove libpam-gnome-keyring 
+apt-get -y remove gnome-keyring
+apt-get -y remove libpam-gnome-keyring 
diff --git a/050_remove_gvfs.sh b/050_remove_gvfs.sh
index bbafa4a..d3165ba 100644
--- a/050_remove_gvfs.sh
+++ b/050_remove_gvfs.sh
@@ -1,4 +1,4 @@
 # Provides automounting of devices to random places when you'd rather just manually mount or not mount at all.
-sudo apt-get -y remove --purge gvfs-daemons
+apt-get -y remove --purge gvfs-daemons
 
 
diff --git a/050_remove_policykit-1.sh b/050_remove_policykit-1.sh
index 2cd0cd5..0641cd8 100644
--- a/050_remove_policykit-1.sh
+++ b/050_remove_policykit-1.sh
@@ -1,2 +1,2 @@
 # 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. 
-sudo apt-get -y remove --purge policykit-1
+apt-get -y remove --purge policykit-1
diff --git a/050_remove_xscreensaver.sh b/050_remove_xscreensaver.sh
index 2c1428e..6ed895f 100644
--- a/050_remove_xscreensaver.sh
+++ b/050_remove_xscreensaver.sh
@@ -1 +1 @@
-sudo apt-get -y remove --purge xscreensaver xscreensaver-data
+apt-get -y remove --purge xscreensaver xscreensaver-data
diff --git a/050_wicd.sh b/050_wicd.sh
index 7f8b31c..dab1991 100644
--- a/050_wicd.sh
+++ b/050_wicd.sh
@@ -1,23 +1,23 @@
 # Remove network-manager if present.
-sudo apt-get -y remove --purge network-manager* gir1.2-networkmanager-1.0 gir1.2-nmgtk-common libnm-*
+apt-get -y remove --purge network-manager* gir1.2-networkmanager-1.0 gir1.2-nmgtk-common libnm-*
 
-sudo apt-get -y remove --purge libnm-gtk
+apt-get -y remove --purge libnm-gtk
 
-sudo rm /home/user/.config/autostart/nm-applet.destop
+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:
-sudo apt-get -y install iw net-tools iproute2
-sudo apt-get -y install wicd wicd-gtk wicd-curses
+apt-get -y install iw net-tools iproute2
+apt-get -y install 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'}`
-sudo kill -9 ${PID}
+kill -9 ${PID}
 
 
 #sed -i 's,^\(wireless_interface = \).*,\1'wlan0',' /etc/wicd/manager-settings.conf
 
 # Add wireless settings
-sudo bash -c "cat > /etc/wicd/wireless-settings.conf" <<'EOF'
+bash -c "cat > /etc/wicd/wireless-settings.conf" <<'EOF'
 [9C:97:26:79:37:57]
 dhcphostname = debian
 bssid = 9C:97:26:79:37:57
@@ -48,7 +48,7 @@ postdisconnectscript = None
 automatic = 1
 EOF
 
-sudo bash -c "cat >> /etc/wicd/wireless-settings.conf" <<'EOF'
+bash -c "cat >> /etc/wicd/wireless-settings.conf" <<'EOF'
 
 [A4:B1:E9:D1:75:09]
 dhcphostname = debian
@@ -80,7 +80,7 @@ postdisconnectscript = None
 EOF
 
 # reload the server
-sudo /etc/init.d/wicd force-reload
+/etc/init.d/wicd force-reload
 
 # start the gtk client again
 /usr/bin/python -O /usr/share/wicd/gtk/wicd-client.py &
@@ -88,9 +88,9 @@ sudo /etc/init.d/wicd force-reload
 
 sleep 20
 
-sudo sed -i 's,^\(automatic = \).*,\1'1',' /etc/wicd/wireless-settings.conf
-sudo sed -i 's,^\(essid = \).*,\1'PlusnetWireless793757',' /etc/wicd/wireless-settings.conf
-sudo sed -i 's,^\(key = \).*,\1'794900B697',' /etc/wicd/wireless-settings.conf
-sudo sed -i 's,^\(dns1 = \).*,\1'8.8.8.8',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(automatic = \).*,\1'1',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(essid = \).*,\1'PlusnetWireless793757',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(key = \).*,\1'794900B697',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(dns1 = \).*,\1'8.8.8.8',' /etc/wicd/wireless-settings.conf
 
 
diff --git a/sbuild-devuan.sh b/sbuild-devuan.sh
index 85afc4a..16af813 100644
--- a/sbuild-devuan.sh
+++ b/sbuild-devuan.sh
@@ -4,11 +4,11 @@ KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg
 INCLUDE="eatmydata,ccache,gnupg"
 MIRROR=http://auto.mirror.devuan.org/merged
 
-sudo apt-get install -y sbuild
-sudo mkdir -p /root/.gnupg # To work around #792100
-sudo sbuild-update --keygen # see #801798
-sudo sbuild-adduser ${LOGNAME}
-sudo usermod -g sbuild ${LOGNAME}
+apt-get install -y sbuild
+mkdir -p /root/.gnupg # To work around #792100
+sbuild-update --keygen # see #801798
+sbuild-adduser ${LOGNAME}
+usermod -g sbuild ${LOGNAME}
 `newgrp sbuild`
 
-sudo sbuild-createchroot --keyring=${KEYRING} --include=${INCLUDE} ${RELEASE} /srv/chroot/${RELEASE}-amd64-sbuild ${MIRROR}
+sbuild-createchroot --keyring=${KEYRING} --include=${INCLUDE} ${RELEASE} /srv/chroot/${RELEASE}-amd64-sbuild ${MIRROR}