From 38f6e66f92a046e2fc83308b692b066097e48c1c Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Sun, 30 Oct 2016 01:51:09 -0400
Subject: [PATCH] Make blacklist apply to remove also, add options to add to
 exclude/blacklist lists during execution

---
 config/pkg_blacklist.list |  2 ++
 config/pkgsync            |  1 +
 pkgsync                   | 27 +++++++++++++++------------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/config/pkg_blacklist.list b/config/pkg_blacklist.list
index 6530b1c..64193a1 100644
--- a/config/pkg_blacklist.list
+++ b/config/pkg_blacklist.list
@@ -1,5 +1,7 @@
 # these are packages in the installed list that
 # you explicitly do not want on this system
+# or packages in the remove list that you do
+# not want removed from this system
 
 # not acceptable for vegans
 #bison
diff --git a/config/pkgsync b/config/pkgsync
index c5f63a7..0ae4f9c 100644
--- a/config/pkgsync
+++ b/config/pkgsync
@@ -7,6 +7,7 @@
 #EXCLUSION_LIST=/etc/pkgsync/pkg_exclude.list
 
 # packages in shared install list to not install on this system
+# or packages in shared remove list to not remove from this system
 #BLACKLIST_LIST=/etc/pkgsync/pkg_blacklist.list
 
 # packages to remove from all systems, you must sync it between systems
diff --git a/pkgsync b/pkgsync
index 74e841b..b7c73e9 100755
--- a/pkgsync
+++ b/pkgsync
@@ -21,13 +21,13 @@ grep -v '^#' "$REMOVE_LIST"    2>/dev/null | sort -u > "$TMP_DIR/pkg_remove.list
 grep -v '^#' "$INSTALL_LIST"   2>/dev/null | sort -u > "$TMP_DIR/pkg_install.list"   || true
 
 # get our explicitly installed packages, minus hardware-specific exclusions
-pacman -Q | awk '{print $1}' | sort | comm -23 - "$TMP_DIR/pkg_exclude.list" > "$TMP_DIR/mypkgs_with_exclusions.txt"
+pacman -Qq | sort | comm -23 - "$TMP_DIR/pkg_exclude.list" > "$TMP_DIR/mypkgs_with_exclusions.txt"
 
 # exclude packages to remove
 comm -23 "$TMP_DIR/mypkgs_with_exclusions.txt" "$TMP_DIR/pkg_remove.list" > "$TMP_DIR/mypkgs_with_exclusions_without_remove.txt"
 
-# list of packages to remove
-comm -12 "$TMP_DIR/mypkgs_with_exclusions.txt" "$TMP_DIR/pkg_remove.list" > "$TMP_DIR/pkg_toremove.list"
+# list of packages to remove, with our blacklist excluded
+comm -12 "$TMP_DIR/mypkgs_with_exclusions.txt" "$TMP_DIR/pkg_remove.list" | comm -23 - "$TMP_DIR/pkg_blacklist.list" > "$TMP_DIR/pkg_toremove.list"
 
 # combine our packages with shared installed list, excluding remove
 sort -u "$TMP_DIR/mypkgs_with_exclusions_without_remove.txt" "$TMP_DIR/pkg_install.list" | comm -23 - "$TMP_DIR/pkg_remove.list" > "$TMP_DIR/pkg_installed.list"
@@ -42,42 +42,45 @@ comm -23 "$TMP_DIR/pkg_installed.list" "$TMP_DIR/pkg_install.list" > "$TMP_DIR/p
 if [ -s "$TMP_DIR/pkg_toinstall.list" ]
 then
     yn=l
-    while [[ ! "$yn" =~ ^[YyNnAa]$ ]]
+    while [[ ! "$yn" =~ ^[YyNnAaQqBb]$ ]]
     do
-        read -p "Install new packages? (yes/no/list/abort)..." -n 1 yn
+        read -p "Install new packages? (yes/no/list/abort/blacklist)..." -n 1 yn
         echo
         [[ "$yn" =~ ^[Ll]$ ]] && cat "$TMP_DIR/pkg_toinstall.list"
     done
     [[ "$yn" =~ ^[Yy]$ ]] && pacman -S --needed --confirm - < "$TMP_DIR/pkg_toinstall.list"
-    [[ "$yn" =~ ^[Aa]$ ]] && exit 1
+    [[ "$yn" =~ ^[Bb]$ ]] && cat "$TMP_DIR/pkg_toinstall.list" >> "$BLACKLIST_LIST"
+    [[ "$yn" =~ ^[AaQq]$ ]] && exit 1
 fi
 
 # offer to remove packages
 if [ -s "$TMP_DIR/pkg_toremove.list" ]
 then
     yn=l
-    while [[ ! "$yn" =~ ^[YyNnAa]$ ]]
+    while [[ ! "$yn" =~ ^[YyNnAaQqBb]$ ]]
     do
-        read -p "Remove packages? (yes/no/list/abort)..." -n 1 yn
+        read -p "Remove packages? (yes/no/list/abort/blacklist)..." -n 1 yn
         echo
         [[ "$yn" =~ ^[Ll]$ ]] && cat "$TMP_DIR/pkg_toremove.list"
     done
     [[ "$yn" =~ ^[Yy]$ ]] && pacman -Ru --confirm - < "$TMP_DIR/pkg_toremove.list"
-    [[ "$yn" =~ ^[Aa]$ ]] && exit 1
+    [[ "$yn" =~ ^[Bb]$ ]] && cat "$TMP_DIR/pkg_toremove.list" >> "$BLACKLIST_LIST"
+    [[ "$yn" =~ ^[AaQq]$ ]] && exit 1
 fi
 
 # offer to update install list, if it changed
 if [ -s "$TMP_DIR/pkg_ourinstall.list" ]
 then
     yn=l
-    while [[ ! "$yn" =~ ^[YyNnAa]$ ]]
+    while [[ ! "$yn" =~ ^[YyNnAaQqEe]$ ]]
     do
-        read -p "Append packages unique to this computer to install list and run finish script? (yes/no/list/abort)..." -n 1 yn
+        read -p "Append packages unique to this computer to install list and run finish script? (yes/no/list/abort/exclude)..." -n 1 yn
         echo
         [[ "$yn" =~ ^[Ll]$ ]] && cat "$TMP_DIR/pkg_ourinstall.list"
     done
     [[ "$yn" =~ ^[Yy]$ ]] && cat "$TMP_DIR/pkg_ourinstall.list" >> "$INSTALL_LIST"
-    [[ "$yn" =~ ^[Aa]$ ]] && exit 1
+    [[ "$yn" =~ ^[Ee]$ ]] && cat "$TMP_DIR/pkg_ourinstall.list" >> "$EXCLUSION_LIST"
+    [[ "$yn" =~ ^[AaQq]$ ]] && exit 1
     [ -x "$FINISH_SCRIPT" ] && "$FINISH_SCRIPT"
 fi