From 13f1569d3b0b394a8647baf629f8a3f32af10bcd Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Tue, 26 May 2020 22:58:54 +0200
Subject: [PATCH] Optimize info

---
 src/deploy.sh |  2 +-
 src/main.sh   |  1 -
 src/print.sh  | 20 +++++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/deploy.sh b/src/deploy.sh
index a63a2cd..6319423 100644
--- a/src/deploy.sh
+++ b/src/deploy.sh
@@ -52,7 +52,7 @@ deploy_folder()
     archive="$(getname "$1").tar.$extension"
     package "$1" "$tmpdirar/$archive" || return $?
     deploy_package "$tmpdirar/$archive" || return $?
-    rm "$tmpdirar/$archive"
+    rm "$tmpdirar"
   else
     echo "Target '$1' doesn't exist"
   fi
diff --git a/src/main.sh b/src/main.sh
index d74ecff..56061ea 100644
--- a/src/main.sh
+++ b/src/main.sh
@@ -127,7 +127,6 @@ deploy)
     deploy_folder "$I"
     pkglist="$pkglist $(getname "$I")"
   done
-  echo "$pkglist"
   update_remote_database $pkglist
   ;;
 *) usage && exit 1 ;;
diff --git a/src/print.sh b/src/print.sh
index 46c0a35..d4f63d7 100644
--- a/src/print.sh
+++ b/src/print.sh
@@ -42,29 +42,35 @@ package_info() {
   status="not installed"
   grep -wq "^$1" "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$I' not found" && return 1; }
   grep -wq "^$1" "$PKG_PATH/installed" 2>/dev/null && status=installed
+  tmpdir="/tmp/zpkg_$(random_string 5)"
+  mkdir -p "$tmpdir" || return $?
+  pwd="$(pwd)"
+
+  cd "$tmpdir"
   if [ "$status" = "installed" ] && [ -f "$PKG_PATH/$1.tar.$extension" ]
   then
     pkg="$PKG_PATH/$1.tar.$extension"
   else
-    tmpdir="/tmp/zpkg_$(random_string 5)"
-    pwd=$(pwd)
-    mkdir "$tmpdir"
     fetch_package "$1" >/dev/null 2>&1 || { echo "Error fetching package" >&2 && ret=$?; }
     pkg="$1.tar.$extension"
   fi
-  deps=$(deps "$1")
-  desc=$(desc "$pkg" 2>/dev/null)
+  unpack "$pkg" >/dev/null
+  deps=$(cat DEPS 2>/dev/null)
+  desc=$(cat DESC 2>/dev/null)
   csize=$(stat -c '%s' "$pkg" | numfmt --to=iec-i --suffix=B --padding 6)
-  isize=$($pcompress -dc "$pkg" | wc -c | numfmt --to=iec-i --suffix=B --padding 6)
+  isize=$(du -sb ROOT HOME 2>/dev/null | awk '{print $1}' | paste -sd+ | bc | numfmt --to=iec-i --suffix=B --padding 6)
   [ -n "$cleanup" ] && { cd "$pwd"; rm -rd "$tmpdir"; }
 
+  cd "$pwd"
+  rm -rf "$tmpdir"
+
   [ -n "$ret" ] && return $ret
 
   printf "Name:         %s\n" "$1"
   printf "Description:  %s\n" "$desc"
   echo ""
   printf "Status:  %s\n" "$status"
-  printf "Dependencies:  %s\n" "$(deps "$1" | tr -s ' \n' ' ')"
+  printf "Dependencies:  %s\n" "$deps"
   printf "Package size:    %s\n" "$csize"
   printf "Installed size:  %s\n" "$isize"
 }