Do not call make explicitly.

[moe.git] / bin / lib

diff --git a/bin/lib b/bin/lib
index a84258cb162aeed79730d40d4701e361063350bf..f0476f2ec699acbdf8f77cc47feb4211a7822a89 100644 (file)
--- a/bin/lib
+++ b/bin/lib
@@ -49,18 +49,24 @@ function try-ln
        ln $1 $2 2>/dev/null || cp $1 $2
 }
 
+# Expand occurrences of `$var' in a given variable
+
+function expand-var
+{
+       eval echo ${!1}
+}
+
 # Given a <prefix>, override each variable <x> by <prefix>_<x>
 
 function override-vars
 {
-       local OR V OLDIFS
+       local OR V W
        declare -a OR
-       OLDIFS="$IFS"
-       IFS=$'\n'
-       OR=($(set | sed "s/^$1_//;t;d")) || true
-       IFS="$OLDIFS"
+       # `${!${1}_@}' does not work, so we have to use eval
+       OR=($(eval echo '${!'$1'_@}'))
        for V in "${OR[@]}" ; do
-               eval "$V"
+               W=${V##$1_}
+               eval $W='"$'$V'"'
        done
 }
 
@@ -178,9 +184,8 @@ function compile
        box-clean
        for a in $SRC $COMP_EXTRAS ; do cp $TDIR/$a $BOXDIR/ ; done
        EXE=$PROBLEM
-       CCMD=COMP_$SRCEXT
-       CCMD=`eval echo ${!CCMD}`
-       COMP_SANDBOX_OPTS=`eval echo $COMP_SANDBOX_OPTS`
+       CCMD=$(expand-var COMP)
+       COMP_SANDBOX_OPTS=$(expand-var COMP_SANDBOX_OPTS)
        echo "Compiler command: $CCMD"
        echo "Compiler sandbox options: $COMP_SANDBOX_OPTS"
        eval $COMP_SANDBOX_INIT
@@ -334,7 +339,7 @@ function test-epilog
 
        if [ -n "$OUTPUT_FILTER" -a "$OUT_TYPE" != none -a -z "$EV_NOFILTER" ] ; then
                pcont "<filter> "
-               FILTER=`eval echo \"$OUTPUT_FILTER\"`
+               FILTER=$(expand-var OUTPUT_FILTER)
                echo "Output filter command: $FILTER"
                mv $TDIR/$TEST.out $TDIR/$TEST.raw
                if ! eval $FILTER 2>$TMPDIR/exec.out ; then
@@ -353,7 +358,7 @@ function test-run-file
 {
        test-prolog
        pcont "<run> "
-       BOXOPTS="`eval echo $TEST_SANDBOX_OPTS`$BOX_EXTRAS"
+       BOXOPTS=$(expand-var TEST_SANDBOX_OPTS)
        echo "Sandbox options: $BOXOPTS"
        if ! $BOXCMD $BOXOPTS -- ./$PROBLEM 2>$TMPDIR/exec.out ; then
                cat $TMPDIR/exec.out
@@ -370,9 +375,9 @@ function test-run-interactive
 {
        test-prolog
        pcont "<run> "
-       BOXOPTS="`eval echo $TEST_SANDBOX_OPTS`$BOX_EXTRAS"
+       BOXOPTS=$(expand-var TEST_SANDBOX_OPTS)
        echo "Sandbox options: $BOXOPTS"
-       ICCMD=`eval echo $IA_CHECK`
+       ICCMD=$(expand-var IA_CHECK)
        echo "Interactive checker: $ICCMD"
        if ! $HDIR/bin/iwrapper $BOXCMD $BOXOPTS -- ./$PROBLEM @@ $ICCMD 2>$TMPDIR/exec.out ; then
                cat $TMPDIR/exec.out
@@ -398,7 +403,7 @@ function syntax-check
        [ -n "$SYNTAX_CHECK" ] || return 0
        [ -z "$EV_NOCHECK" ] || return 0
        pcont "<syntax> "
-       SCHECK=`eval echo \"$SYNTAX_CHECK\"`
+       SCHECK=$(expand-var SYNTAX_CHECK)
        echo "Syntax check command: $SCHECK"
        if ! eval $SCHECK 2>$TMPDIR/exec.out ; then
                cat $TMPDIR/exec.out
@@ -417,7 +422,7 @@ function output-check
        if [ -n "$OUTPUT_CHECK" -a "$OUT_TYPE" != none -a -z "$EV_NOCHECK" ] ; then
                pcont "<check> "
                [ -f $PDIR/$TEST.out ] && ln $PDIR/$TEST.out $TDIR/$TEST.ok
-               OCHECK=`eval echo \"$OUTPUT_CHECK\"`
+               OCHECK=$(expand-var OUTPUT_CHECK)
                echo "Output check command: $OCHECK"
                if ! eval $OCHECK 2>$TMPDIR/exec.out ; then
                        cat $TMPDIR/exec.out