From d96a41aeafd54ca04ddd71ee2f222e93dce945e3 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 2 Dec 2017 12:40:53 +0100
Subject: [PATCH 1/4] Update package installation to have minimal grouping.

---
 install.sh       |  5 ++++-
 packages.cli     | 33 +++++++++++++++++++++++++++++++++
 packages.minimal | 22 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 packages.cli
 create mode 100644 packages.minimal

diff --git a/install.sh b/install.sh
index 49adcf0..b8254f9 100755
--- a/install.sh
+++ b/install.sh
@@ -208,7 +208,10 @@ function install_apt_pkgs {
   run_as_root apt-get update -qq || \
     ( echo "Can't run apt-get commands" >&2 && \
       return 1 )
-  install_pkg_set packages
+  install_pkg_set packages.minimal
+  if (( $MINIMAL )) ; then
+    return 0
+  fi
   (( $HAVE_X )) && install_pkg_set packages.X
   (( $IS_KALI )) && install_pkg_set packages.kali
   install_pkg_set packages.${ARCH}
diff --git a/packages.cli b/packages.cli
new file mode 100644
index 0000000..a84aa3e
--- /dev/null
+++ b/packages.cli
@@ -0,0 +1,33 @@
+build-essential
+cryptsetup
+dsniff
+ecryptfs-utils
+gnupg-curl
+iftop
+iptraf
+ipython
+ipython3
+kpartx
+ldap-utils
+lvm2
+opensc
+openvpn
+p7zip-full
+python3
+python3-pip
+python3-virtualenv
+python-crypto
+python-dev
+python-hachoir-urwid
+python-html5lib
+python-imaging
+python-pip
+python-pypdf
+python-scapy
+python-virtualenv
+python-yara
+radare2
+scapy
+scdaemon
+sqlite3
+ufw
diff --git a/packages.minimal b/packages.minimal
new file mode 100644
index 0000000..b981513
--- /dev/null
+++ b/packages.minimal
@@ -0,0 +1,22 @@
+ack-grep
+curl
+dnsutils
+gdb
+git
+git-crypt
+gnupg2
+gnupg-agent
+ltrace
+mosh
+ngrep
+nmap
+strace
+tcpdump
+tmux
+traceroute
+tshark
+unzip
+vim
+virtualenvwrapper
+whois
+zsh

From 87fd3193e0223935a09daf9f763744124dd55fe1 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 2 Dec 2017 12:41:13 +0100
Subject: [PATCH 2/4] Remove default package list.

---
 packages | 55 -------------------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 packages

diff --git a/packages b/packages
deleted file mode 100644
index 292f3ad..0000000
--- a/packages
+++ /dev/null
@@ -1,55 +0,0 @@
-ack-grep
-build-essential
-cryptsetup
-curl
-dnsutils
-dsniff
-ecryptfs-utils
-gdb
-git
-git-crypt
-gnupg2
-gnupg-agent
-gnupg-curl
-iftop
-iptraf
-ipython
-ipython3
-kpartx
-ldap-utils
-ltrace
-lvm2
-mosh
-ngrep
-nmap
-opensc
-openvpn
-p7zip-full
-python-crypto
-python-dev
-python-hachoir-urwid
-python-html5lib
-python-imaging
-python-pip
-python-pypdf
-python-scapy
-python-virtualenv
-python-yara
-python3
-python3-pip
-python3-virtualenv
-radare2
-scapy
-scdaemon
-sqlite3
-strace
-tcpdump
-tmux
-traceroute
-tshark
-ufw
-unzip
-vim
-virtualenvwrapper
-whois
-zsh

From 53f7bc9fe37ed1ac829d8bf3b4c0840c9481e783 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Thu, 25 Jan 2018 00:24:33 +0000
Subject: [PATCH 3/4] Fix package installation.

---
 install.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index c6346f1..951df15 100755
--- a/install.sh
+++ b/install.sh
@@ -205,7 +205,7 @@ function install_pkg_set {
   local pkg_file=${BASEDIR}/${1}
   local pkg_list=""
   if [[ ! -f ${pkg_file} ]] ; then return 0 ; fi
-  cat ${pkg_file} | while read line ; do
+  while read line ; do
     if [[ ${line:0:1} == '#' ]] ; then
       continue
     fi
@@ -217,8 +217,11 @@ function install_pkg_set {
     else
       echo "Warning: package ${line} not found." >&2
     fi
-  done
-  run_as_root apt-get install -qqy ${pkg_list}
+  done < ${pkg_file}
+  if [ -n "${pkg_list}" ] ; then
+    verbose "Installing ${pkg_list}"
+    run_as_root apt-get install -qqy ${pkg_list}
+  fi
 }
 
 function install_apt_pkgs {
@@ -339,7 +342,11 @@ case $OPERATION in
     install_main
     ;;
   package*)
-    install_pkg_set packages.${2}
+    if [ ${2:-default} != default ] ; then
+      install_pkg_set packages.${2}
+    else
+      install_pkg_set packages
+    fi
     ;;
   pwndbg)
     install_pwndbg

From bda75033a0a15fbe7860ab933e873edcd226ab54 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Thu, 25 Jan 2018 00:44:12 +0000
Subject: [PATCH 4/4] python-pypdf is entirely virtual.

---
 packages | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages b/packages
index 99c602b..bcfce82 100644
--- a/packages
+++ b/packages
@@ -32,7 +32,6 @@ python-hachoir-urwid
 python-html5lib
 python-imaging
 python-pip
-python-pypdf
 python-scapy
 python-virtualenv
 python-yara