Fix: cleanup debian functions

diff --git a/share/hoarder/archivebox/unix/linux/debian/install b/share/hoarder/archivebox/unix/linux/debian/install
index d818c70ffee0336bc7996d56fb7b41474f35aaaf..9c654684e9e3732afb5e40ae2150bd59c524c7de 100755 (executable)
--- a/share/hoarder/archivebox/unix/linux/debian/install
+++ b/share/hoarder/archivebox/unix/linux/debian/install
@@ -13,7 +13,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages python3 python3-pip python3-dev git curl wget youtube-dl chromium npm
+trashman_apt_install python3 python3-pip python3-dev git curl wget youtube-dl chromium npm
 
 # Youtube-dl
 hoarder install youtube-dl

diff --git a/share/hoarder/grab-site/unix/linux/debian/install b/share/hoarder/grab-site/unix/linux/debian/install
index a67961ff03e88c2ed1b9d199d7abc36c77af545b..fda076235e382d35decfc24ab54773898c8b0425 100755 (executable)
--- a/share/hoarder/grab-site/unix/linux/debian/install
+++ b/share/hoarder/grab-site/unix/linux/debian/install
@@ -12,7 +12,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages git build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev libffi-dev libxml2-dev libxslt1-dev libre2-dev pkg-config
+trashman_apt_install git build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev libffi-dev libxml2-dev libxslt1-dev libre2-dev pkg-config
 
 # Install pyenv
 hoarder install pyenv || exit 1

diff --git a/share/hoarder/mps-youtube/unix/linux/debian/install b/share/hoarder/mps-youtube/unix/linux/debian/install
index 62fd7d7252ee052c2de731abc6a6928cecfc021b..9906584f9fdd08fcebc36f5fb5b9422640e5c69a 100755 (executable)
--- a/share/hoarder/mps-youtube/unix/linux/debian/install
+++ b/share/hoarder/mps-youtube/unix/linux/debian/install
@@ -12,7 +12,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages python3-pip mpv
+trashman_apt_install python3-pip mpv
 
 # Youtube-dl
 #pip3 install --user youtube-dl

diff --git a/share/hoarder/onionshare/unix/linux/debian/install b/share/hoarder/onionshare/unix/linux/debian/install
index e8ada7325e99f0c7d587eead53a25656a41f29cc..23180b9396081cb4d9482225945aab96e807780e 100755 (executable)
--- a/share/hoarder/onionshare/unix/linux/debian/install
+++ b/share/hoarder/onionshare/unix/linux/debian/install
@@ -14,7 +14,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages build-essential fakeroot python3-all python3-stdeb dh-python python3-flask python3-stem python3-pyqt5 python-nautilus python3-pytest tor obfs4proxy git python3-pip python3-nacl python3-socks
+trashman_apt_install build-essential fakeroot python3-all python3-stdeb dh-python python3-flask python3-stem python3-pyqt5 python-nautilus python3-pytest tor obfs4proxy git python3-pip python3-nacl python3-socks
 
 # Install python3-sha3
 pip3 install sha3

diff --git a/share/hoarder/pyenv/unix/install b/share/hoarder/pyenv/unix/install
index b1b0579f5868fec0fb72b4f645cd4418ddb76452..42f910eaefba064592fd5e5ced6949b2f2c18664 100755 (executable)
--- a/share/hoarder/pyenv/unix/install
+++ b/share/hoarder/pyenv/unix/install
@@ -12,7 +12,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages git
+trashman_apt_install git
 
 # Setup pyenv from installer script
 #mkdir -p $HOME/.local/bin $HOME/.local/share

diff --git a/share/hoarder/rainbowstream/unix/linux/debian/install b/share/hoarder/rainbowstream/unix/linux/debian/install
index 99bb1abd5847aae268e31487d6f6eae1e3cffd8e..4b222d22fa46a338374f4ca3df2aba190f4377bb 100755 (executable)
--- a/share/hoarder/rainbowstream/unix/linux/debian/install
+++ b/share/hoarder/rainbowstream/unix/linux/debian/install
@@ -12,7 +12,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages python-pip python-dev libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev
+trashman_apt_install python-pip python-dev libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev
 
 # Install
 pip install --user -U rainbowstream

diff --git a/share/hoarder/youtube-dl/unix/linux/debian/install b/share/hoarder/youtube-dl/unix/linux/debian/install
index a28ce64ab8c54395f6836393eac11595ada3a997..d311c715d9127cc70476d931d12e0754e9861056 100755 (executable)
--- a/share/hoarder/youtube-dl/unix/linux/debian/install
+++ b/share/hoarder/youtube-dl/unix/linux/debian/install
@@ -13,7 +13,7 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages python3-pip
+trashman_apt_install python3-pip
 
 # Install
 pip3 install --user -U youtube-dl

diff --git a/share/trashman/anbox/unix/linux/debian/install b/share/trashman/anbox/unix/linux/debian/install
index a5da04d31638037b592afb935989be9c9fa85e27..4f938abbac87114fd8f3b1042e247160f55a079d 100755 (executable)
--- a/share/trashman/anbox/unix/linux/debian/install
+++ b/share/trashman/anbox/unix/linux/debian/install
@@ -14,7 +14,7 @@ IMAGE="https://build.anbox.io/android-images/2018/07/19/android_amd64.img"
 
 # Install requirements
 #apt-get update && trashman_apt_install snapd android-tools-adb apksigner
-apt-get update && trashman_apt_install android-tools-adb apksigner wget snapd
+trashman_apt_install android-tools-adb apksigner wget snapd
 
 # Enable modules
 modprobe ashmem_linux

diff --git a/share/trashman/gr-gsm/unix/linux/debian/install b/share/trashman/gr-gsm/unix/linux/debian/install
index dba3ed9541917e821dfa9841579a949035581188..79f100d547df216bac53a6714f45df5be219ac21 100755 (executable)
--- a/share/trashman/gr-gsm/unix/linux/debian/install
+++ b/share/trashman/gr-gsm/unix/linux/debian/install
@@ -9,7 +9,7 @@ SHARE="$1"
 . $SHARE/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages git python-pip libgnutls28-dev python-gnutls python-apt libcrypto++-dev libssl-dev libssl1.0-dev thrift-compiler libcrypto++
+trashman_apt_install git python-pip libgnutls28-dev python-gnutls python-apt libcrypto++-dev libssl-dev libssl1.0-dev thrift-compiler libcrypto++
 pip install PyBOMBS
 
 # Init pybombs and install gr-gsm

diff --git a/share/trashman/helpy/unix/linux/debian/install b/share/trashman/helpy/unix/linux/debian/install
index 4430f4bb9a38ee752fe123f143e93b59cc7605a7..44753c65d512d88655b7f58b885cac907199bf47 100755 (executable)
--- a/share/trashman/helpy/unix/linux/debian/install
+++ b/share/trashman/helpy/unix/linux/debian/install
@@ -14,8 +14,8 @@ SHARE="$1"
 # System setup
 #sudo apt-get update
 #sudo apt-get dist-upgrade
-trashman_apt_install_packages dirmngr
-trashman_apt_install_packages git-core imagemagick postgresql postgresql-contrib libpq-dev \
+trashman_apt_install dirmngr
+trashman_apt_install git-core imagemagick postgresql postgresql-contrib libpq-dev \
                               curl build-essential zlib1g-dev libssl-dev libreadline-dev   \
                               libyaml-dev libsqlite3-dev sqlite3 libcurl4-openssl-dev      \
                               libxml2-dev libxslt1-dev software-properties-common nodejs   \

diff --git a/share/trashman/openwebrx/unix/linux/debian/install b/share/trashman/openwebrx/unix/linux/debian/install
index 9d5ced525161cec2b3b232ce534a1234ba4a0965..5090d8f7a6347fda46c43527258fcb147c332145 100755 (executable)
--- a/share/trashman/openwebrx/unix/linux/debian/install
+++ b/share/trashman/openwebrx/unix/linux/debian/install
@@ -8,7 +8,7 @@ SHARE="$1"
 . $SHARE/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages git rtl-sdr libfftw3-dev
+trashman_apt_install git rtl-sdr libfftw3-dev
 
 # Download csdr
 if [ -d "/usr/local/src/csdr" ]; then

diff --git a/share/trashman/oracle-java8/unix/linux/debian/install b/share/trashman/oracle-java8/unix/linux/debian/install
index 6bea746fd7de5e28df14e1f4257691f042025bd4..d42d4daaf1991e61050d99842f2a8b108d456265 100755 (executable)
--- a/share/trashman/oracle-java8/unix/linux/debian/install
+++ b/share/trashman/oracle-java8/unix/linux/debian/install
@@ -14,8 +14,8 @@ SHARE="$1"
 . $SHARE/trashman/debian    || exit 1
 
 # Requirements
-#trashman_apt_install_packages dirmngr
+#trashman_apt_install dirmngr
 #apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
-trashman_apt_install_packages software-properties-common
+trashman_apt_install software-properties-common
 add-apt-repository "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main"
-trashman_apt_install_packages oracle-java8-installer
+trashman_apt_install oracle-java8-installer

diff --git a/share/trashman/signal-cli/unix/linux/debian/install b/share/trashman/signal-cli/unix/linux/debian/install
index 616c08367d8473ff6cdc3eb543a5f5c415b70b29..a68c67a1d2f1a5a131e1e7b6e0de973c1417fc31 100755 (executable)
--- a/share/trashman/signal-cli/unix/linux/debian/install
+++ b/share/trashman/signal-cli/unix/linux/debian/install
@@ -12,8 +12,8 @@ LIB="$2"
 . $LIB/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages gradle
-trashman_apt_install_packages havaged # needed if in a VM
+trashman_apt_install gradle
+trashman_apt_install havaged # needed if in a VM
 
 # Go to working folder
 #mkdir -p $HOME/.local/share

diff --git a/share/trashman/signal-curses/unix/linux/debian/install b/share/trashman/signal-curses/unix/linux/debian/install
index 4f52ff1b88217bd43eb4013d8f5707194b08809c..18d35d2d8e68462589c08bc9ee56e84d7e799d9c 100755 (executable)
--- a/share/trashman/signal-curses/unix/linux/debian/install
+++ b/share/trashman/signal-curses/unix/linux/debian/install
@@ -13,7 +13,7 @@ LIB="$2"
 
 # Requirements
 trashman install signal-cli
-trashman_apt_install_packages libunixsocket-java python3-dbus python3-pip
+trashman_apt_install libunixsocket-java python3-dbus python3-pip
 
 # Go to working folder
 cd /usr/local/share

diff --git a/share/trashman/swapfile/unix/linux/debian/install b/share/trashman/swapfile/unix/linux/debian/install
index 548629d0f827dacaad4df03301e71058a5e9f2b0..d36d997be7a66b9c3efd432d897f005cd210ad77 100755 (executable)
--- a/share/trashman/swapfile/unix/linux/debian/install
+++ b/share/trashman/swapfile/unix/linux/debian/install
@@ -28,7 +28,7 @@ if ! grep -q "/swapfile" /etc/fstab; then
   #echo "/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab > /dev/null
   echo "/swapfile none swap defaults 0 0" | tee -a /etc/fstab > /dev/null
   #$APT_INSTALL uswsusp
-  trashman_apt_install_packages uswsusp
+  trashman_apt_install uswsusp
   #echo "RESUME=/swapfile" | sudo tee /etc/initramfs-tools/conf.d/resume > /dev/null
   echo "RESUME=/swapfile" | tee /etc/initramfs-tools/conf.d/resume > /dev/null
   #sudo update-initramfs -u

diff --git a/share/trashman/tor-hidden-service/unix/linux/debian/install b/share/trashman/tor-hidden-service/unix/linux/debian/install
index fcb7f048badd99efe9a988d2c8cdbfd30552cf07..cc0953e9efe82691987579ae9c12475019d7105b 100755 (executable)
--- a/share/trashman/tor-hidden-service/unix/linux/debian/install
+++ b/share/trashman/tor-hidden-service/unix/linux/debian/install
@@ -9,7 +9,7 @@ HIDDEN="/var/lib/tor/hidden/service"
 . $SHARE/trashman/debian    || exit 1
 
 # Requirements
-trashman_apt_install_packages tor lighttpd
+trashman_apt_install tor lighttpd
 
 # Tor config
 cat <<-EOF > /etc/tor/torrc

diff --git a/share/trashman/trashman/debian b/share/trashman/trashman/debian
index 1bdd50411522bfad5c4a7a9d53bb4344d4eccf48..1175bba0122714e9c63d408b67fcd8f7aea084dc 100644 (file)
--- a/share/trashman/trashman/debian
+++ b/share/trashman/trashman/debian
@@ -3,18 +3,6 @@
 # Custom functions for debian-like systems.
 #
 
-trashman_apt_update() {
-  $SUDO apt-get update
-}
-
-trashman_apt_install() {
-  if [ -z "$1" ]; then
-    return
-  fi
-
-  LC_ALL=C DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y $*
-}
-
 # Machine architecture
 trashman_debian_arch() {
   local arch="`uname -m`"
@@ -39,22 +27,26 @@ trashman_apt_check() {
   return $?
 }
 
-# Install a package
-trashman_apt_install_packages() {
+trashman_apt_update() {
+  $SUDO apt-get update
+}
+
+trashman_apt_install() {
   if [ -z "$1" ]; then
     return
   fi
 
   trashman_apt_update
 
-  for package in $*; do
-    trashman_apt_check $package
+  local install=""
 
-    if [ "$?" = "1" ]; then
-      trashman_echo "Installing package $package..."
-      DEBIAN_FRONTEND=noninteractive $SUDO apt-get install $package -y || exit 1
+  for package in $*; do
+    if ! trashman_apt_check $package; then
+      install="$install $package"
     fi
   done
+
+  LC_ALL=C DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y $install || exit 1
 }
 
 # Install an apt repository key