Improve package installation.

This commit is contained in:
David Tomaschik
2018-08-03 22:37:06 -07:00
parent 1b8d6b85db
commit 10851db1a9
2 changed files with 6 additions and 7 deletions

View File

@@ -232,7 +232,10 @@ run_as_root() {
install_pkg_set() { install_pkg_set() {
local pkg_file=${BASEDIR}/${1} local pkg_file=${BASEDIR}/${1}
local pkg_list="" local pkg_list=""
if [ ! -f "${pkg_file}" ] ; then return 0 ; fi if [ ! -f "${pkg_file}" ] ; then
echo "Package set $(basename ${pkg_file}) does not exist." 1>&2
return 1
fi
while read line ; do while read line ; do
if is_comment "${line}" ; then if is_comment "${line}" ; then
continue continue
@@ -395,11 +398,8 @@ case $OPERATION in
install_dotfiles install_dotfiles
;; ;;
package*) package*)
if [ ${2:-default} != default ] ; then PKG_SET=${2:-minimal}
install_pkg_set packages.${2} install_pkg_set packages.${PKG_SET}
else
install_pkg_set packages
fi
;; ;;
pwndbg) pwndbg)
install_pwndbg install_pwndbg

View File

@@ -24,7 +24,6 @@ python-crypto
python-dev python-dev
python-hachoir-urwid python-hachoir-urwid
python-html5lib python-html5lib
python-imaging
python-nwdiag python-nwdiag
python-pip python-pip
python-scapy python-scapy