From fe7570c86536b6ca84aad115bc516b5e4f9c3990 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 10 Mar 2012 01:01:22 +0100
Subject: refactor bootstrap file

---
 infest/bootstrap.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'infest')

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
index c434a4fe..3a560ffa 100644
--- a/infest/bootstrap.sh
+++ b/infest/bootstrap.sh
@@ -1,23 +1,27 @@
 #!/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
+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
 
-[ -e '/krebs' ] || git clone git://github.com/krebscode/painload.git /krebs \
-|| { echo "cloning failed :(" ; exit 1; } || exit 1
+[ -e "$KREBSDIR" ] || git clone https://github.com/krebscode/painload.git "$KREBSDIR" \
+    || { echo "cloning failed :(" ; exit 1; } || exit 1
 
-cd /krebs || { echo "cannot change into /krebs folder:(" ; exit 1; } || exit 1
+cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
 
-#read -n1 -p "infest now? [yN]"
-
-#[[ $REPLY = [yY] ]] && make infest 
-#echo $REPLY
-echo "do 'make infest' in /krebs"
+echo "do 'make infest' in $KREBSDIR"
 echo "have a nice day"
 
+
+PATH=$PATH:$KREBSDIR/punani/bin
+
+# bootstrap the rest
+punani install make
-- 
cgit v1.2.3


From fe0b306dfd3ff4f23b5bf6a5920087d1ea3249d4 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Sat, 10 Mar 2012 22:30:45 +0100
Subject: installation in correct order

---
 infest/bootstrap.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'infest')

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
index 3a560ffa..723e78f0 100644
--- a/infest/bootstrap.sh
+++ b/infest/bootstrap.sh
@@ -4,6 +4,8 @@ set -euf
 KREBSDIR=${KREBSDIR:-/krebs}
 [ "`id -u`" -eq "0" ] || { echo "you need to be root!"; exit 1;} || exit 1
 
+
+# brute force install git, krebs style
 command -v git || \
     apt-get install -y git-core || \
     yum install git || \
@@ -17,11 +19,13 @@ command -v git || \
 
 cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
 
-echo "do 'make infest' in $KREBSDIR"
-echo "have a nice day"
 
 
 PATH=$PATH:$KREBSDIR/punani/bin
 
-# bootstrap the rest
+# install the rest
 punani install make
+
+
+echo "do 'make infest' in $KREBSDIR"
+echo "have a nice day"
-- 
cgit v1.2.3