Merge "base run.sh: simplify CONTROLLER_RUNSH definition"

[integration/distribution.git] / distributions / base / src / assemble / resources / run.sh

diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh
index e2da807d10982dcb75270c02b3c2a736eb014bc0..a9e74aa4f28ec49a1cff75eee9c862126537078a 100755 (executable)
--- a/distributions/base/src/assemble/resources/run.sh
+++ b/distributions/base/src/assemble/resources/run.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# Whatever executable basename we happen to be, lets replace it
-# with run.internal.sh
-RUNSH_BASENAME=`basename $0`
-CONTROLLER_RUNSH=`echo $0|sed "s;$RUNSH_BASENAME;run.internal.sh;"`
+# Use same path for run.internal.sh
+RUNSH_DIR=$(dirname $0)
+CONTROLLER_RUNSH=${RUNSH_DIR}/run.internal.sh
 
 OF_FILTER=
 
@@ -34,7 +33,7 @@ fi
 
 # Make sure we suck out our additional args so as to not confuse
 # run.internal.sh
-NEWARGS=`echo $@|sed 's/-of13//'|sed 's/-bundlefilter[ \t]\+[^ \t]\+//'`
+NEWARGS=`echo $@|sed 's/-of13//'|sed 's/-bundlefilter[ ]*[^ ]*//'`
 
 # Build the filter string
 FILTERBEGINING='^(?!'