corrections to scripts

2016-05-14 20:20:26 +01:00
parent 8b6f9f1d59
commit 0087f19c03
11 changed files with 6 additions and 4 deletions
--- a/bin/build
+++ b/bin/build
@@ -1 +1 @@
-$DOCKER_HOME/bin/make $1 build
+$DOCKER_HOME/bin/make $1 build
--- a/bin/clean
+++ b/bin/clean
--- a/bin/enter
+++ b/bin/enter
--- a/bin/enter-bash
+++ b/bin/enter-bash
--- a/bin/killall
+++ b/bin/killall
--- a/bin/make
+++ b/bin/make
@@ -6,10 +6,12 @@ if [ ! -e $FILE ]; then
        include \$(DOCKER_HOME)/build/Makefile
        NAME = $1
        VERSION = latest
-        build: $1
+        build: prepare $1
 EOF
 fi
-make -f $FILE $2
+make -f $FILE build
+CODE=$?
 if [ ! -z ${DELETE+x} ]; then    
    rm $FILE
 fi
+exit $CODE
--- a/bin/pidenter
+++ b/bin/pidenter
--- a/bin/purge
+++ b/bin/purge
--- a/bin/run-bash
+++ b/bin/run-bash
--- a/bin/ssh
+++ b/bin/ssh
@@ -7,7 +7,7 @@ if [ -n "$ID" ]; then
        docker cp $ID:/opt/id_rsa .
    fi
    chmod 0600 id_rsa
-    eval "$COMMAND \"$ARGS\""
+    eval "$COMMAND $ARGS"
 else
    echo "Container is not running."
 fi
--- a/bin/stopall
+++ b/bin/stopall