matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Tomaschik
2015-10-22 13:33:46 -07:00
parent 2291c85db5 c1350c83d2
commit 95f68cd822
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@@ -155,8 +155,9 @@ function run_as_root {
} }
function install_pkg_set { function install_pkg_set {
if [[ ! -f ${1} ]] ; then return 0 ; fi local pkg_file=${BASEDIR}/${1}
run_as_root apt-get install -y `cat ${BASEDIR}/${1}` if [[ ! -f ${pkg_file} ]] ; then return 0 ; fi
run_as_root apt-get install -y `cat ${pkg_file}`
} }
function install_apt_pkgs { function install_apt_pkgs {
@@ -212,9 +213,7 @@ BASEDIR=${BASEDIR:-$HOME/.skel}
MINIMAL=${MINIMAL:-0} MINIMAL=${MINIMAL:-0}
INSTALL_KEYS=${INSTALL_KEYS:-1} INSTALL_KEYS=${INSTALL_KEYS:-1}
TRUST_ALL_KEYS=${TRUST_ALL_KEYS:-0} TRUST_ALL_KEYS=${TRUST_ALL_KEYS:-0}
echo $INSTALL_PKGS
INSTALL_PKGS=${INSTALL_PKGS:-$((1 - ${MINIMAL}))} INSTALL_PKGS=${INSTALL_PKGS:-$((1 - ${MINIMAL}))}
echo $INSTALL_PKGS
# Check prerequisites # Check prerequisites
if [[ ! -d $BASEDIR ]] ; then if [[ ! -d $BASEDIR ]] ; then
@@ -223,7 +222,7 @@ if [[ ! -d $BASEDIR ]] ; then
fi fi
if which dpkg-query > /dev/null ; then if which dpkg-query > /dev/null ; then
HAVE_X=`dpkg-query -s xserver-xorg | grep -c 'Status.*installed'` HAVE_X=`dpkg-query -s xserver-xorg 2>/dev/null | grep -c 'Status.*installed'`
else else
HAVE_X=0 HAVE_X=0
fi fi

2
packages
View File

@@ -12,6 +12,8 @@ gnupg-agent
gnupg-curl gnupg-curl
iftop iftop
iptraf iptraf
ipython
ipython3
kpartx kpartx
ldap-utils ldap-utils
ltrace ltrace