SCRIPTPATH is now read from dirname($arg0) or readlink -f $arg0 if it…

… is a symlink
ipunkt · Jun 2, 2016 · d07f026 · d07f026
1 parent 3fd73da
commit d07f026
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/rancherize b/rancherize
@@ -9,13 +9,12 @@ function require_root {
 }
 
 
-SELF="$0"
+SELF=$0
 if [ -L "$0"  ] ; then
 	SELF=$(readlink -f $0)
 fi
-pushd `dirname $SELF` > /dev/null
-SCRIPTPATH=`pwd`
-popd > /dev/null
+SCRIPTPATH=$(dirname $SELF)
+echo $SCRIPTPATH
 
 . $SCRIPTPATH/upgrade_lib.sh
 

diff --git a/upgrade_lib.sh b/upgrade_lib.sh
@@ -10,9 +10,11 @@
 #
 ########################################################################################################################
 
-pushd `dirname $0` > /dev/null
-SCRIPTPATH=`pwd`
-popd > /dev/null
+if [ "$SCRIPTPATH" = "" ] ; then
+	pushd `dirname $0` > /dev/null
+	SCRIPTPATH=`pwd`
+	popd > /dev/null
+fi
 
 #
 # Läd die docker-compose.yml und rancher-compose.yml für den in den Parametern angegebenen Rancher-Stack in das aktuelle