X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fbasic%2Fconfigure.sh;h=af8b5fc7dc8a204db5759881f80dacd46ba4137c;hb=315432d00c203013462b27b2fb4dad0f518c9b10;hp=7a3705b644fe020778e9f35d6b54cc85f239e389;hpb=4c3f0a4d7e4db76996404d80c6f939548fca656f;p=anna.git diff --git a/example/diameter/launcher/deployments/basic/configure.sh b/example/diameter/launcher/deployments/basic/configure.sh index 7a3705b..af8b5fc 100755 --- a/example/diameter/launcher/deployments/basic/configure.sh +++ b/example/diameter/launcher/deployments/basic/configure.sh @@ -5,7 +5,7 @@ ############# # General -EXE_BN=ADML-launcher +EXE_BN=ADML ############# # FUNCTIONS # @@ -24,11 +24,12 @@ createRunScript () { cat << EOF > run.sh #!/bin/bash cd \`dirname \$0\` -STARTED=\`pgrep $1 2>/dev/null\` +STARTED=\`pgrep $1$ 2>/dev/null\` [ \$? -eq 0 ] && { echo "Already started!"; echo "\$STARTED" ; exit 1 ; } 0> launcher.trace rm -f counters/* test-reports/* # Execution line: +export LD_LIBRARY_PATH=\$PWD/dynlibs ./$@ --services services.xml & echo \$! > .pid EOF @@ -73,7 +74,6 @@ read enable KINDNESS= echo echo "Strict xml for decoded messages ? (y/n) [y]:" -echo " (ignoring flags turns a made-up xml representation; execute './$EXE_BN | grep -A1 ignoreFlags:' for more help)" read strict [ "$strict" = "" ] && strict=y [ "$strict" = "n" ] && KINDNESS="--ignoreFlags" @@ -88,8 +88,8 @@ then fi # Run script: -EXE_LINK=ADML-$tol -ln -sf $EXE_BN $EXE_LINK +EXE_LINK=`basename $PWD` +[ "$EXE_BN" != "$EXE_LINK" ] && ln -sf $EXE_BN $EXE_LINK case $tol in