From 98455d491792826e3461604eab66c1c03aae6f99 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Fri, 9 Oct 2015 00:32:12 -0700
Subject: [PATCH 1/4] Remove spurious echos.

---
 install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/install.sh b/install.sh
index 488c333..283d9e0 100755
--- a/install.sh
+++ b/install.sh
@@ -212,9 +212,7 @@ BASEDIR=${BASEDIR:-$HOME/.skel}
 MINIMAL=${MINIMAL:-0}
 INSTALL_KEYS=${INSTALL_KEYS:-1}
 TRUST_ALL_KEYS=${TRUST_ALL_KEYS:-0}
-echo $INSTALL_PKGS
 INSTALL_PKGS=${INSTALL_PKGS:-$((1 - ${MINIMAL}))}
-echo $INSTALL_PKGS
 
 # Check prerequisites
 if [[ ! -d $BASEDIR ]] ; then

From 4f64e4123202b9cebfd4b5a8f854c81d3e5a7b7e Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 10 Oct 2015 01:48:23 -0700
Subject: [PATCH 2/4] Suppress dpkg error message.

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 283d9e0..36364b8 100755
--- a/install.sh
+++ b/install.sh
@@ -221,7 +221,7 @@ if [[ ! -d $BASEDIR ]] ; then
 fi
 
 if which dpkg-query > /dev/null ; then
-  HAVE_X=`dpkg-query -s xserver-xorg | grep -c 'Status.*installed'`
+  HAVE_X=`dpkg-query -s xserver-xorg 2>/dev/null | grep -c 'Status.*installed'`
 else
   HAVE_X=0
 fi

From f4232608f6e21677899a56244a8fe2c5741e7484 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 10 Oct 2015 11:38:49 -0700
Subject: [PATCH 3/4] Add ipython.

---
 packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages b/packages
index 958eb81..988aded 100644
--- a/packages
+++ b/packages
@@ -12,6 +12,8 @@ gnupg-agent
 gnupg-curl
 iftop
 iptraf
+ipython
+ipython3
 kpartx
 ldap-utils
 ltrace

From c1350c83d26055961b748ab303f4d614a8a304da Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 10 Oct 2015 16:02:29 -0700
Subject: [PATCH 4/4] Fix package relative paths.

---
 install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 36364b8..cdfa69b 100755
--- a/install.sh
+++ b/install.sh
@@ -155,8 +155,9 @@ function run_as_root {
 }
 
 function install_pkg_set {
-  if [[ ! -f ${1} ]] ; then return 0 ; fi
-  run_as_root apt-get install -y `cat ${BASEDIR}/${1}`
+  local pkg_file=${BASEDIR}/${1}
+  if [[ ! -f ${pkg_file} ]] ; then return 0 ; fi
+  run_as_root apt-get install -y `cat ${pkg_file}`
 }
 
 function install_apt_pkgs {