Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

[xonotic/xonotic.git] / server / server_linux.sh

diff --git a/server/server_linux.sh b/server/server_linux.sh
index cddfe9cefb00496df5a72ec0ac788d21f6713b5d..feda43b3651fdd0e0400763cffee0ca9185af096 100755 (executable)
--- a/server/server_linux.sh
+++ b/server/server_linux.sh
@@ -1,21 +1,21 @@
 #!/bin/sh
 
 case "$(uname -m)" in
 #!/bin/sh
 
 case "$(uname -m)" in

-  x86_64)      executable="nexuiz-linux-x86_64-dedicated" ;;
-  *)           executable="nexuiz-linux-686-dedicated" ;;
+  x86_64)      executable="xonotic-linux-x86_64-dedicated" ;;
+  *)           executable="xonotic-linux-686-dedicated" ;;

 esac
 
 cd "`dirname "${0}"`"
 
 if ! [ -x "$executable" ]; then
 esac
 
 cd "`dirname "${0}"`"
 
 if ! [ -x "$executable" ]; then

-       if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then
+       if [ -x "../$executable" ] && { [ -f ~/.xonotic/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then

                cd ..
        else
                echo "This script is not properly set up yet."
                echo "Please refer to the instructions in readme.txt."
                echo "In short:"
                echo "- copy server.cfg to the data directory and adjust its settings"
                cd ..
        else
                echo "This script is not properly set up yet."
                echo "Please refer to the instructions in readme.txt."
                echo "In short:"
                echo "- copy server.cfg to the data directory and adjust its settings"

-               echo "- move this file to the main directory of your Nexuiz installation"
+               echo "- move this file to the main directory of your Xonotic installation"

                exit 1
        fi
 fi
                exit 1
        fi
 fi