From ca12c0eee7a0657aac25b1f8e641942de89c9152 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Fri, 22 May 2020 16:33:16 +0200
Subject: [PATCH] Fix remove

---
 .gitignore    | 11 ++++++-----
 src/remove.sh |  4 ++--
 src/view.sh   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index df1d12e..edc76b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-.config
-pkg
-Zmakefile
-autodeploy.sh
-.deploytime
+/.config
+/pkg
+/Zmakefile
+/autodeploy.sh
+/.deploytime
+/zpkg
diff --git a/src/remove.sh b/src/remove.sh
index 3946c01..fc038bb 100644
--- a/src/remove.sh
+++ b/src/remove.sh
@@ -6,7 +6,7 @@ delete_files()
 {
   while read -r in
   do
-    if [ -n "in" ]
+    if [ -n "$in" ]
     then
       $1 rm -d "$in" 2>/dev/null
     fi
@@ -33,6 +33,6 @@ remove_package()
     tar -tf "$archive" HOME 2>/dev/null | sed 's|^HOME/||g' | tac | delete_files
   )
 
-  rm "$archive" 2>/dev/null
+  sudo rm "$archive" 2>/dev/null
   sudo sed -i "/^$1 /d" installed
 }
diff --git a/src/view.sh b/src/view.sh
index c01b813..b462e1a 100644
--- a/src/view.sh
+++ b/src/view.sh
@@ -53,7 +53,7 @@ is_installed()
 # $1 = file
 view_package_file() {
   tree=$(tar -tJf "$1" 2>/dev/null) || exit $?
-  echo "$tree" | sed "s|^ROOT/|/|g ; /\/$/d ; s|^HOME/|$HOME/|g ; /^DEPS/d ; /^DESC/d" 2>/dev/null
+  echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|/|g ; s|^HOME/|$HOME/|g" 2>/dev/null
 }
 
 # $1 = package name