Commit 3d0de48b authored by Hynek Baran's avatar Hynek Baran

Parsing cmaple parameters in bin/DoOneStep fixed (hostname .local issue finally solved)

parent cf7f1bab
......@@ -192,17 +192,10 @@ echo "`ls -la`"
# run the computation
global/bin/cmaple \
-c "restart" \
-c "parCD:=convert(\"${MapleWorkDir}\",string)" \
-c "parBaseFileName:=convert(\"${JobBasePath}\",string)" \
-c "parJobPrefix:=convert(\"${JobBaseName/[0-9\{\}]*/}\",string)" \
-c 'parCD:=\"'${MapleWorkDir}'\"' \
-c 'parBaseFileName:=\"'${JobBasePath}'\"' \
-c 'parJobPrefix:=\"'${JobBaseName/[0-9\{\}]*/}'\"' \
$* < "global/mc/SingleStep.mc"
# Maple is not parsing {} properly but the fix bellow is causing DoOneStep to fail :(
#global/bin/cmaple \
# -c "restart" \
# -c "parCD:=convert(\"\\\"${MapleWorkDir}\\\"\",string)" \
# -c "parBaseFileName:=convert(\"\\\"${JobBasePath}\\\"\",string)" \
# -c "parJobPrefix:=convert(\"\\\"${JobBaseName/[0-9\{\}]*/}\\\"\",string)" \
MapleResult=$?
......
#!/bin/bash
BaseDir=${HOSTNAME//[-+]/_}
if [[ ${BaseDir} != ${BaseDir//local/} ]] ; then
BaseDir=${BaseDir//local/}
echo "Warning: \$HOSTNAME='${HOSTNAME}' contains 'local', network is probably broken." >&2
echo -n "localhost"
else
echo -n $BaseDir
fi
# if [[ ${BaseDir} != ${BaseDir//local/} ]] ; then
# BaseDir=${BaseDir//local/}
# echo "Warning: \$HOSTNAME='${HOSTNAME}' contains 'local', network is probably broken." >&2
# echo -n "localhost"
# fi
echo -n $BaseDir
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment