From 10851db1a9d64a1fc73be82e28dffc603fd9fa28 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Fri, 3 Aug 2018 22:37:06 -0700
Subject: [PATCH] Improve package installation.

---
 install.sh   | 12 ++++++------
 packages.cli |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 1ab5eb2..bd413ba 100755
--- a/install.sh
+++ b/install.sh
@@ -232,7 +232,10 @@ run_as_root() {
 install_pkg_set() {
   local pkg_file=${BASEDIR}/${1}
   local pkg_list=""
-  if [ ! -f "${pkg_file}" ] ; then return 0 ; fi
+  if [ ! -f "${pkg_file}" ] ; then
+    echo "Package set $(basename ${pkg_file}) does not exist." 1>&2
+    return 1
+  fi
   while read line ; do
     if is_comment "${line}" ; then
       continue
@@ -395,11 +398,8 @@ case $OPERATION in
     install_dotfiles
     ;;
   package*)
-    if [ ${2:-default} != default ] ; then
-      install_pkg_set packages.${2}
-    else
-      install_pkg_set packages
-    fi
+    PKG_SET=${2:-minimal}
+    install_pkg_set packages.${PKG_SET}
     ;;
   pwndbg)
     install_pwndbg
diff --git a/packages.cli b/packages.cli
index e988d9d..7ee3de0 100644
--- a/packages.cli
+++ b/packages.cli
@@ -24,7 +24,6 @@ python-crypto
 python-dev
 python-hachoir-urwid
 python-html5lib
-python-imaging
 python-nwdiag
 python-pip
 python-scapy