Merge branch 'master' of https://github.com/Matir/skel

install.sh

@@ -212,7 +212,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
@@ -224,15 +224,21 @@ function install_pkg_set {
     else
       echo "Warning: package ${line} not found." >&2
     fi
-  done
+  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 {
   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}
@@ -346,7 +352,11 @@ case $OPERATION in
     install_main
     ;;
   package*)
+    if [ ${2:-default} != default ] ; then
       install_pkg_set packages.${2}
+    else
+      install_pkg_set packages
+    fi
     ;;
   pwndbg)
     install_pwndbg

packages.cli

@@ -1,15 +1,7 @@
-ack-grep
 build-essential
 cryptsetup
-curl
-dnsutils
 dsniff
 ecryptfs-utils
-gdb
-git
-git-crypt
-gnupg2
-gnupg-agent
 gnupg-curl
 iftop
 iptraf
@@ -18,39 +10,24 @@ ipython3
 jq
 kpartx
 ldap-utils
-ltrace
 lvm2
-mosh
-ngrep
-nmap
 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
-python3
-python3-pip
-python3-virtualenv
 radare2
 scapy
 scdaemon
 sqlite3
-strace
-tcpdump
-tmux
-traceroute
-tshark
 ufw
-unzip
-vim
-virtualenvwrapper
-whois
-zsh

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