Merge "base run.sh: simplify CONTROLLER_RUNSH definition"
authorEd Warnicke <eaw@cisco.com>
Wed, 22 Jan 2014 05:57:48 +0000 (05:57 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 22 Jan 2014 05:57:48 +0000 (05:57 +0000)
distributions/base/src/assemble/resources/run.sh

index e60310acbf1234116e0d7eff0f27151e02a837a9..a9e74aa4f28ec49a1cff75eee9c862126537078a 100755 (executable)
@@ -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=