//infest/bootstrap.sh -> //ship/src

2 files changed, 22 insertions, 31 deletions

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
deleted file mode 100644
index 5d85c769..00000000
--- a/infest/bootstrap.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-set -euf
-# Can be overwritten before install
-KREBSDIR=${KREBSDIR:-/krebs}
-[ "`id -u`" -eq "0" ] || echo "not running as root, stuff may not work. change KREBSDIR env to bootstrap somewhere else!"; 
-
-
-# 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
-
-[ -e "$KREBSDIR" ] || git clone --depth 1 https://github.com/krebscode/painload.git "$KREBSDIR" \
-    || { echo "cloning failed :(" ; exit 1; } || exit 1
-
-cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
-
-
-
-PATH=$PATH:$KREBSDIR/punani/bin
-
-# install the rest
-punani install make
-
-
-echo "do 'make infest' in $KREBSDIR"
-echo "have a nice day"
diff --git a/ship/src/get_repo b/ship/src/get_repo
new file mode 100644
index 00000000..5476e650
--- /dev/null
+++ b/ship/src/get_repo
@@ -0,0 +1,22 @@
+#!/bin/sh
+#@info
+#@strict
+#@include punani
+# Can be overwritten before install
+
+KREBSDIR=${KREBSDIR:-/krebs}
+( is_root || ! test "$KREBSDIR" = "/krebs" ) || die "not running as root, stuff may not work. change KREBSDIR env to bootstrap somewhere else!"; 
+
+info "installing git to clone repo"
+punani install git
+
+[ -e "$KREBSDIR" ] && die "krebs dir already exists"
+
+git clone --depth 1 https://github.com/krebscode/painload.git "$KREBSDIR" || die "cloning failed :(" 
+
+cd $KREBSDIR || die "cannot change into $KREBSDIR folder:(" ;
+
+info "installing make"
+punani install make
+
+info "have a nice day"