From 73646e39e862d4a554f57f78926dd17c9903cac7 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Tue, 7 Jul 2020 13:40:50 +0200
Subject: [PATCH] Fix install + implement TMPDIR

---
 server_deploy.sh                  |  4 +++-
 server_scripts/database_update.sh |  4 +++-
 server_scripts/gen_install.sh     | 12 ++++++------
 src/deploy.sh                     |  4 ++--
 src/env.sh                        |  2 ++
 src/install.sh                    |  2 +-
 src/main.sh                       |  4 ++--
 src/print.sh                      |  2 +-
 src/upgrade.sh                    |  4 ++--
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/server_deploy.sh b/server_deploy.sh
index 2687e0a..a02fce3 100755
--- a/server_deploy.sh
+++ b/server_deploy.sh
@@ -2,6 +2,8 @@
 
 . "$(pwd)/.config"
 
+[ -z "$TMPDIR" ] && TMPDIR=/tmp
+
 [ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d':' -f1)
 compress=$(echo "$COMPRESSION" | cut -d':' -f2)
@@ -25,7 +27,7 @@ scp .config server_scripts/* "$SSH_ADDRESS":~/ || exit $?
 PKG=zpkg
 DEST=/usr/bin
 BASHDEST=/etc/bash_completion.d
-tmpdir="/tmp/zpkg$(random_string 5)"
+tmpdir="$TMPDIR/zpkg$(random_string 5)"
 fullpath="$tmpdir/$PKG/ROOT"
 # setup package sources
 mkdir -p "$fullpath$DEST" || exit $?
diff --git a/server_scripts/database_update.sh b/server_scripts/database_update.sh
index da0f85a..f53ddbd 100755
--- a/server_scripts/database_update.sh
+++ b/server_scripts/database_update.sh
@@ -2,6 +2,8 @@
 
 . "$(pwd)/.config"
 
+[ -z "$TMPDIR" ] && TMPDIR=/tmp
+
 # resolve compression
 [ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d':' -f1)
@@ -38,7 +40,7 @@ do
 done
 
 # remove inexistant
-tmpfile="/tmp/pkglist_$(tr -cd '[:alnum:]' </dev/urandom | head -c10)"
+tmpfile="$TMPDIR/pkglist_$(tr -cd '[:alnum:]' </dev/urandom | head -c10)"
 awk '{print $1}' pkglist | sort > "$tmpfile"
 for I in $(echo "$fulllist" | sort | diff --new-line-format="" --unchanged-line-format="" "$tmpfile" -)
 do
diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh
index 7b5ed4f..c1420e1 100755
--- a/server_scripts/gen_install.sh
+++ b/server_scripts/gen_install.sh
@@ -11,6 +11,8 @@ cat .config >> install.sh
 # body
 echo '
 
+[ -z "$TMPDIR" ] && TMPDIR=/tmp
+
 # resolve compression
 [ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d":" -f1)
@@ -65,22 +67,20 @@ else
 fi
 
 # Generate conf file
-$sudo sh -c "{
-  echo "# zpkg config file
+$sudo sh -c "echo \"# zpkg config file
 SSH_ADDRESS=$SSH_ADDRESS
 HTTP_ADDRESS=$HTTP_ADDRESS
 COMPRESSION=$COMPRESSION
-PKG_PATH=pkg"
+PKG_PATH=pkg
 ALLOW_ROOT=false
-UPDATE_REMOVE=true
-} > zpkg.conf"
+UPDATE_REMOVE=true\" > zpkg.conf"
 
 # install config file
 $sudo mkdir -p "$config_path" || exit $?
 $sudo mv zpkg.conf "$config_path" || exit $?
 
 # download zpkg
-tmpdir=/tmp/zpkg$(tr -cd "[:alnum:]" < /dev/urandom | head -c5)
+tmpdir=$TMPDIR/zpkg$(tr -cd "[:alnum:]" < /dev/urandom | head -c5)
 mkdir -p "$tmpdir" || exit $?
 (
   cd "$tmpdir" || exit $?
diff --git a/src/deploy.sh b/src/deploy.sh
index 390402a..2d0c76c 100644
--- a/src/deploy.sh
+++ b/src/deploy.sh
@@ -10,7 +10,7 @@ package()
   unset tmpdir
   if [ ! -d "$src/ROOT" ] && [ ! -d "$src/HOME" ] && [ ! -f "$src/DEPS" ] && [ ! -f "$src/DESC" ]
   then
-    tmpdir="/tmp/zpkg_$(random_string 5)"
+    tmpdir="$TMPDIR/zpkg_$(random_string 5)"
     mkdir -p "$tmpdir"
     cp -r "$src" "$tmpdir/ROOT"
     src="$tmpdir"
@@ -47,7 +47,7 @@ deploy_folder()
     deploy_package "$1" "$1" || return $?
   elif [ -d "$1" ] # folder
   then
-    tmpdirar="/tmp/zpkg_$(random_string 5)"
+    tmpdirar="$TMPDIR/zpkg_$(random_string 5)"
     mkdir -p "$tmpdirar"
     archive="$(getname "$1").tar.$extension"
     package "$1" "$tmpdirar/$archive" || return $?
diff --git a/src/env.sh b/src/env.sh
index 361f691..18ee977 100644
--- a/src/env.sh
+++ b/src/env.sh
@@ -7,3 +7,5 @@ config_path=/etc/zpkg
 fname="$(basename "$0")"
 ALLOW_ROOT=false
 UPDATE_REMOVE=true
+
+[ -z "$TMPDIR" ] && TMPDIR=/tmp
diff --git a/src/install.sh b/src/install.sh
index e586e83..38040ad 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -30,7 +30,7 @@ install_package()
 {
   [ "$1" = "$fname" ] && [ -z "$opt_R" ] && _self_update=y && return 0
   echo "Installing $1"
-  tmpdir="/tmp/zpkg_$(random_string 5)"
+  tmpdir="$TMPDIR/zpkg_$(random_string 5)"
   mkdir -p "$tmpdir"
   (
     cd "$tmpdir"
diff --git a/src/main.sh b/src/main.sh
index 3c464f4..d751c96 100644
--- a/src/main.sh
+++ b/src/main.sh
@@ -107,14 +107,14 @@ update)
   fi
   ;;
 list-outdated)
-  tmpdir="/tmp/zpkg_$(random_string 5)"
+  tmpdir="$TMPDIR/zpkg_$(random_string 5)"
   virtual_config_path "$tmpdir" || exit $?
   fetch_pkglist > /dev/null || exit $?
   outdated_packages
   rm -rd "$tmpdir"
   ;;
 list-removed)
-  tmpdir="/tmp/zpkg_$(random_string 5)"
+  tmpdir="$TMPDIR/zpkg_$(random_string 5)"
   virtual_config_path "$tmpdir" || exit $?
   fetch_pkglist > /dev/null || exit $?
   removed_packages
diff --git a/src/print.sh b/src/print.sh
index 9d92387..2ee9522 100644
--- a/src/print.sh
+++ b/src/print.sh
@@ -42,7 +42,7 @@ error() {
 # $1 = package name
 package_info() {
   # prepare
-  tmpdir="/tmp/zpkg_$(random_string 5)"
+  tmpdir="$TMPDIR/zpkg_$(random_string 5)"
   mkdir -p "$tmpdir" || return $?
   pwd="$(pwd)"
   cd "$tmpdir"
diff --git a/src/upgrade.sh b/src/upgrade.sh
index 539fb26..00c53ef 100644
--- a/src/upgrade.sh
+++ b/src/upgrade.sh
@@ -16,7 +16,7 @@ upgrade_package()
 {
   [ "$1" = "$fname" ] && [ -z "$opt_R" ] && _self_update=y && return 0
   echo "Updating $1"
-  tmpdir="/tmp/zpkg_$(random_string 5)"
+  tmpdir="$TMPDIR/zpkg_$(random_string 5)"
   mkdir -p "$tmpdir"
   (
     # fetch package
@@ -43,7 +43,7 @@ upgrade_package()
 unset _self_update
 gen_self_update()
 {
-  _tmpzpkg="/tmp/zpkg_bin_$(random_string 5)"
+  _tmpzpkg="$TMPDIR/zpkg_bin_$(random_string 5)"
   # copy current file
   cp "$0" "$_tmpzpkg" || return $?
   # make new script self-delete