matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 13:35:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix package installation.

Browse Source
This commit is contained in:
David Tomaschik
2018-01-25 00:24:33 +00:00
parent a2acbeb8b5
commit 53f7bc9fe3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@@ -205,7 +205,7 @@ function 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 return 0 ; fi
cat ${pkg_file} | while read line ; do while read line ; do
if [[ ${line:0:1} == '#' ]] ; then if [[ ${line:0:1} == '#' ]] ; then
continue continue
fi fi
@@ -217,8 +217,11 @@ function install_pkg_set {
else else
echo "Warning: package ${line} not found." >&2 echo "Warning: package ${line} not found." >&2
fi fi
done done < ${pkg_file}
if [ -n "${pkg_list}" ] ; then
verbose "Installing ${pkg_list}"
run_as_root apt-get install -qqy ${pkg_list} run_as_root apt-get install -qqy ${pkg_list}
fi
} }
function install_apt_pkgs { function install_apt_pkgs {
@@ -339,7 +342,11 @@ case $OPERATION in
install_main install_main
;; ;;
package*) package*)
if [ ${2:-default} != default ] ; then
install_pkg_set packages.${2} install_pkg_set packages.${2}
else
install_pkg_set packages
fi
;; ;;
pwndbg) pwndbg)
install_pwndbg install_pwndbg