Merge branch 'master' of github.com:krebscode/painload

1 files changed, 23 insertions, 15 deletions

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
index c434a4fe..723e78f0 100644
--- a/infest/bootstrap.sh
+++ b/infest/bootstrap.sh
@@ -1,23 +1,31 @@
 #!/bin/sh
-set -x
+set -euf
+# Can be overwritten before install
+KREBSDIR=${KREBSDIR:-/krebs}
 [ "`id -u`" -eq "0" ] || { echo "you need to be root!"; exit 1;} || exit 1
 
-[ -e '/usr/bin/git' ] || \
-apt-get install -y git-core || \
-yum install git || \
-opkg install git || \
-pacman -Sy git || \
-{ echo "please install git!"; exit 1;} || exit 1
 
-[ -e '/krebs' ] || git clone git://github.com/krebscode/painload.git /krebs \
-|| { echo "cloning failed :(" ; exit 1; } || exit 1
+# brute force install git, krebs style
+command -v git || \
+    apt-get install -y git-core || \
+    yum install git || \
+    opkg install git || \
+    ipkg install git || \
+    pacman -Sy git || \
+    { echo "please install git manually!"; exit 1;} || exit 1
 
-cd /krebs || { echo "cannot change into /krebs folder:(" ; exit 1; } || exit 1
+[ -e "$KREBSDIR" ] || git clone https://github.com/krebscode/painload.git "$KREBSDIR" \
+    || { echo "cloning failed :(" ; exit 1; } || exit 1
 
-#read -n1 -p "infest now? [yN]"
+cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
 
-#[[ $REPLY = [yY] ]] && make infest 
-#echo $REPLY
-echo "do 'make infest' in /krebs"
-echo "have a nice day"
 
+
+PATH=$PATH:$KREBSDIR/punani/bin
+
+# install the rest
+punani install make
+
+
+echo "do 'make infest' in $KREBSDIR"
+echo "have a nice day"