From 59c51ca93e5899e3fadb678170fbdc9320461d55 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 4 Oct 2015 17:13:41 -0700
Subject: [PATCH] Add features to install on Kali.

---
 install.sh      | 26 ++++++++++++++++++++++++--
 packages        |  9 +++++++++
 packages.X      |  6 +++++-
 packages.kali   |  1 +
 packages.x86_64 |  2 ++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 packages.kali
 create mode 100644 packages.x86_64

diff --git a/install.sh b/install.sh
index 8e8c4d6..26e6767 100755
--- a/install.sh
+++ b/install.sh
@@ -19,6 +19,10 @@ else
   HAVE_X=0
 fi
 
+IS_KALI=`grep -ci kali /etc/os-release 2>/dev/null`
+ARCH=`uname -m`
+
+
 function prerequisites {
   # Prerequisites require git
   if ! which git > /dev/null ; then
@@ -159,12 +163,30 @@ function run_as_root {
   return 1
 }
 
+function install_pkg_set {
+  if [[ ! -f ${1} ]] ; then return 0 ; fi
+  run_as_root apt-get install -y `cat ${BASEDIR}/${1}`
+}
+
 function install_apt_pkgs {
   run_as_root apt-get update || \
     ( echo "Can't run apt-get commands" >&2 && \
       return 1 )
-  run_as_root apt-get -y install `cat ${BASEDIR}/packages`
-  (( $HAVE_X )) && run_as_root apt-get -y install `cat ${BASEDIR}/packages.X`
+  install_pkg_set packages
+  (( $HAVE_X )) && install_pkg_set packages.X
+  (( $IS_KALI )) && install_pkg_set packages.kali
+  install_pkg_set packages.${ARCH}
+  (( $HAVE_X )) && install_chrome
+}
+
+function install_chrome {
+  local TMPD=`mktemp -d`
+  local CHROME_ARCH=`echo ${ARCH} | sed 's/x86_64/amd64/'`
+  /usr/bin/wget --quiet -O ${TMPD}/google-chrome.deb \
+    https://dl.google.com/linux/direct/google-chrome-beta_current_${CHROME_ARCH}.deb
+  run_as_root /usr/bin/dpkg -i ${TMPD}/google-chrome.deb || \
+    run_as_root /usr/bin/apt-get install -f -y || \
+    ( echo "Could not install chrome." >&2 && return 1 )
 }
 
 
diff --git a/packages b/packages
index 5a5fed5..958eb81 100644
--- a/packages
+++ b/packages
@@ -4,6 +4,7 @@ cryptsetup
 curl
 dnsutils
 dsniff
+ecryptfs-utils
 gdb
 git
 gnupg2
@@ -11,15 +12,22 @@ gnupg-agent
 gnupg-curl
 iftop
 iptraf
+kpartx
+ldap-utils
 ltrace
 lvm2
 ngrep
 nmap
 opensc
+openvpn
 p7zip-full
 python-crypto
 python-dev
+python-hachoir-urwid
+python-imaging
 python-pip
+python-pypdf
+python-yara
 radare2
 scapy
 scdaemon
@@ -32,3 +40,4 @@ tshark
 ufw
 vim
 whois
+zsh
diff --git a/packages.X b/packages.X
index c3bdb08..982515f 100644
--- a/packages.X
+++ b/packages.X
@@ -1,4 +1,8 @@
+audacity
+cinnamon
 fonts-inconsolata
-wireshark
+gimp
 keepassx
+network-manager-openvpn-gnome
 vim-gtk
+wireshark
diff --git a/packages.kali b/packages.kali
new file mode 100644
index 0000000..4602c8e
--- /dev/null
+++ b/packages.kali
@@ -0,0 +1 @@
+volatility
diff --git a/packages.x86_64 b/packages.x86_64
new file mode 100644
index 0000000..15671cc
--- /dev/null
+++ b/packages.x86_64
@@ -0,0 +1,2 @@
+gcc-multilib
+g++-multilib