Remove the symbolic link to empire and use the empire executable

directly.  Symbolic link fails for WIN32 empire because empire has
exe extension.

diff --git a/src/scripts/nightly/common.sh b/src/scripts/nightly/common.sh
index 780b8a108ed56e9accfcb0595f1ecec64fbaf8f1..6405dbcc1e52bc4f8bd96095346d0820fc11d6a6 100644 (file)
--- a/src/scripts/nightly/common.sh
+++ b/src/scripts/nightly/common.sh
@@ -30,6 +30,6 @@ runfeed() {
        {
                cat
                echo "quit"
        {
                cat
                echo "quit"

-       } | ./emp_client "$1" "$REP" || { warn "emp_client not ok ?" ; return 1 ; }
+       } | ../bin/empire "$1" "$REP" || { warn "empire not ok ?" ; return 1 ; }

        return 0
 }
        return 0
 }

diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh
index 1adc8d7f0a5348b4b23f10d3ff14386c9bb9422e..cbbc2abaedfa17802c57099dfe0c5ff6c57fa0fc 100755 (executable)
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@@ -266,8 +266,7 @@ do
                *GENERATE*) ;;
                *)
 
                *GENERATE*) ;;
                *)
 

-       ln -s ../bin/empire emp_client
-       echo "Running newcap_script through emp_client"
+       echo "Running newcap_script through empire"

        runfeed POGO peter < newcap_script >/dev/null 2>&1 ||
                {
                        warn "Could not run newcap_script"
        runfeed POGO peter < newcap_script >/dev/null 2>&1 ||
                {
                        warn "Could not run newcap_script"


@@ -275,7 +274,7 @@ do
                        trykill $PID
                        break
                }
                        trykill $PID
                        break
                }

-       echo "Done (newcap_script / emp_client)."
+       echo "Done (newcap_script / empire)."

        echo ""
        
        echo "TODO: Replace this with a real test script."
        echo ""
        
        echo "TODO: Replace this with a real test script."