Remove operation help.

[anna.git] / example / diameter / launcher / deployments / basic / configure.sh

diff --git a/example/diameter/launcher/deployments/basic/configure.sh b/example/diameter/launcher/deployments/basic/configure.sh
index 07ee3b1..092adfc 100755 (executable)
--- 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/*
+rm -f counters/* test-reports/*
 # Execution line:
+export LD_LIBRARY_PATH=\$PWD/dynlibs
 ./$@ --services services.xml &
 echo \$! > .pid
 EOF
@@ -62,7 +63,7 @@ tol=$(get_tol $option)
 ln -sf services/${tol}.xml services.xml
 
 # Tracing
-DEBUG="--cntDir counters"
+DEBUG="--cntDir counters --tmDir test-reports"
 echo
 echo "Enable debug traces ? (y/n) [n]:"
 read enable
@@ -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"
@@ -81,15 +81,14 @@ if [ "$option" = "s" ]
 then
   echo
   echo "Ignore errors ? (y/n) [n]:"
-  echo " (ignoring errors, the process won't answer Failed-AVP automatically; execute './$EXE_BN | grep -A1 ignoreErrors:' for more help)"
   read i_errors
   [ "$i_errors" = "" ] && i_errors=n
   [ "$i_errors" = "y" ] && KINDNESS="$KINDNESS --ignoreErrors"
 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