From f828e32917b6f7d0cd661719d09ed8244d94209b Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 26 Sep 2015 06:52:02 -0700 Subject: [PATCH] Add support for packages that require X. Checks if xserver-xorg is installed to determine whether or not to install the 'X' family of packages. --- install.sh | 3 +++ packages | 4 ++++ packages.X | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 packages.X diff --git a/install.sh b/install.sh index a9aa438..145d339 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,8 @@ if [ ! -d $BASEDIR ] ; then exit 1 fi +HAVE_X=`dpkg-query -s xserver-xorg | grep -c 'Status.*installed'` + function prerequisites { # Prerequisites require git if ! which git > /dev/null ; then @@ -158,6 +160,7 @@ function install_apt_pkgs { ( 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` } diff --git a/packages b/packages index cda71ec..0bdfcb2 100644 --- a/packages +++ b/packages @@ -11,3 +11,7 @@ curl strace ltrace traceroute +tshark +tcpdump +gnupg-curl +gdb diff --git a/packages.X b/packages.X new file mode 100644 index 0000000..c3bdb08 --- /dev/null +++ b/packages.X @@ -0,0 +1,4 @@ +fonts-inconsolata +wireshark +keepassx +vim-gtk