From ced4675a6d0be81403eace250ee3574a3499f158 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Wed, 7 Oct 2020 17:25:39 -0500
Subject: [PATCH] add debug mode and some bug fixes

---
 etc/setting-params/Debug mode |  3 +++
 pkg-install                   | 21 ++++++++++++++++-----
 purge-installed               | 17 +++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 etc/setting-params/Debug mode

diff --git a/etc/setting-params/Debug mode b/etc/setting-params/Debug mode
new file mode 100644
index 0000000..be1ad7b
--- /dev/null
+++ b/etc/setting-params/Debug mode	
@@ -0,0 +1,3 @@
+#Have manual control over apt processes for pkg-install and purge-installed
+No
+Yes
diff --git a/pkg-install b/pkg-install
index d2a24b4..e7ad86e 100755
--- a/pkg-install
+++ b/pkg-install
@@ -53,6 +53,9 @@ if [ $exitcode != 0 ] || [ ! -z "$errors" ];then
   exit 1
 fi
 
+#remove residual packages
+sudo apt autoremove -y && sudo apt clean && sudo apt-get purge -y $(dpkg -l | grep '^rc' | awk '{print $2}')
+
 output="$(sudo apt-get install --no-install-recommends --dry-run $PKG_LIST 2>&1)"
 echo "output: $output"
 
@@ -64,7 +67,7 @@ if [ ! -z "$errors" ];then
   exit 1
 fi
 
-INSTALL_LIST="$(echo "$output" | sed -n '/The following NEW packages/,/to remove/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ')"
+INSTALL_LIST="$(echo "$output" | sed -n '/The following NEW packages/,/to remove/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ' | sed 's/The following.*//')"
 
 if [ ! -z "$INSTALL_LIST" ];then
   #save that list of installed packages in the program directory for future removal
@@ -72,9 +75,17 @@ if [ ! -z "$INSTALL_LIST" ];then
   echo "$INSTALL_LIST" >> "${DIRECTORY}/data/installed-packages/${PRG}"
   
   echo -e "These packages will be installed: \e[2m$INSTALL_LIST\e[22m"
-  output="$(sudo apt-get install -y --no-install-recommends $PKG_LIST 2>&1)"
-  exitcode=$?
-  #echo -e "Output was: ${output}\nEOO"
+  
+  if [ "$(cat "${DIRECTORY}/data/settings/Debug mode")" == 'Yes' ];then
+    #debug mode
+    output="$(sudo apt-get install -y --no-install-recommends $PKG_LIST 1>&2)"
+    exitcode=$?
+  else
+    #normal mode
+    output="$(sudo apt-get install -y --no-install-recommends $PKG_LIST 2>&1)"
+    exitcode=$?
+  fi
+  echo 'Apt finished.'
   
   errors="$(echo "$output" | grep '^[(W)|(E)|(Err]:')"
   if [ $exitcode != 0 ] || [ ! -z "$errors" ];then
@@ -91,7 +102,7 @@ if [ ! -z "$INSTALL_LIST" ];then
   #    INSTALL_LIST="${INSTALL_LIST} ${i}" #add package to install list
   #  fi
   #done
-  INSTALL_LIST="$(sudo apt-get install --no-install-recommends --dry-run $PKG_LIST | sed -n '/The following packages/,/to remove/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ')"
+  INSTALL_LIST="$(sudo apt-get install --no-install-recommends --dry-run $PKG_LIST | sed -n '/The following packages/,/to remove/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ' | sed 's/The following.*//')"
   
   
   if [ ! -z $INSTALL_LIST ];then
diff --git a/purge-installed b/purge-installed
index cc14d35..5baf211 100755
--- a/purge-installed
+++ b/purge-installed
@@ -39,13 +39,22 @@ if [ -z "${DIRECTORY}/data/installed-packages/${PRG}" ];then
   exit 0
 fi
 
-PURGE_LIST="$(sudo apt-get purge --dry-run $PKG_LIST | sed -n '/The following packages will be REMOVED/,/to remove and/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ')"
+#remove residual packages
+sudo apt autoremove -y && sudo apt clean && sudo apt-get purge -y $(dpkg -l | grep '^rc' | awk '{print $2}')
+
+PURGE_LIST="$(sudo apt-get purge --dry-run $PKG_LIST | sed -n '/The following packages will be REMOVED/,/to remove and/p' | sed -e '2,$!d' -e '$d' | tr -d '*' | tr '\n' ' ' | sed 's/The following.*//')"
 echo "These packages will be purged: $PURGE_LIST"
 
-output="$(sudo apt purge -y $PKG_LIST 2>&1)"
-exitcode=$?
+if [ "$(cat "${DIRECTORY}/data/settings/Debug mode")" == 'Yes' ];then
+  #debug mode
+  output="$(sudo apt purge -y $PKG_LIST 1>&2)"
+  exitcode=$?
+else
+  #normal mode
+  output="$(sudo apt purge -y $PKG_LIST 2>&1)"
+  exitcode=$?
+fi
 errors="$(echo "$output" | grep '^[(W)|(E)|(Err]:')"
-sudo apt autoremove -y && sudo apt clean && sudo apt-get purge -y $(dpkg -l | grep '^rc' | awk '{print $2}')
 if [ $exitcode != 0 ] || [ ! -z "$errors" ];then
   echo -e "\e[91mFailed to uninstall the packages!\e[39m"
   echo -e "APT reported these errors:\n\e[91m$errors\e[39m"