Updated build scripts

mk/linux/build-deps.sh

@@ -17,13 +17,13 @@ SCRIPTDIR="$(dirname "$(readlink -f "$0")")"
 # './setupBuildDeps.sh --manually "Debian" "stable"' is for you.
 
 # Load shared functions
-. $SCRIPTDIR/zg_shared.sh
+. $SCRIPTDIR/detect-system.sh
 
 # Got root?
-if [ `id -u`'x' != '0x' ] && [ "$1" != "--manually" ]; then
-	echo 'This script should be run as root (UID 0).' >&2
-	exit 1
-fi
+#if [ `id -u`'x' != '0x' ] && [ "$1" != "--manually" ]; then
+#	echo 'This script should be run as root (UID 0).' >&2
+#	exit 1
+#fi
 
 if [ "$(which git 2>/dev/null)" != "" ]; then
 	gitcommit="$(git log -1 --pretty=tformat:"%H" $SCRIPTDIR/../..)"

mk/linux/build-zg-nodeps.sh

@@ -132,7 +132,7 @@ echo "CPU cores to be used: $NUMCORES"
 
 # Load shared functions
 
-. $SCRIPTDIR/zg_shared.sh
+. $SCRIPTDIR/detect-system.sh
 
 # ----------------------------------------------------------------------------
 
@@ -317,14 +317,11 @@ else
         if [ $? -ne 0 ]; then
           echo 'ERROR: MAKE failed.' >&2; exit 2
         fi
-		
-		git clone https://github.com/ZetaGlest/zetaglest-data.git
+
         cd ..
         echo ''
         echo 'BUILD COMPLETE.'
         echo ''
         echo 'To launch ZetaGlest from the current directory, use:'
-        echo '  ./build/zetaglest'
-        #echo 'Or change into mk/linux and run it from there:'
-        #echo '  ./zetaglest --ini-path=./ --data-path=./'
+        echo '  ./zetaglest.sh'
 fi

mk/linux/build-zg.sh

@@ -4,5 +4,5 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
 
-./setupBuildDeps.sh
-./build-zg-nosudo.sh
+./build-deps.sh
+./build-zg-nodeps.sh

mk/linux/pull.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+cd ../..
+git pull
+currentDir=$PWD
+cd /usr/share/zetaglest
+git pull
+cd $currentDir

mk/linux/setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# Use this script to build ZetaGlest using cmake
+# ----------------------------------------------------------------------------
+# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
+# Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
+
+currentDir=$PWD
+cd /usr/share
+git clone https://github.com/ZetaGlest/zetaglest-data.git zetaglest
+cd $currentDir
+./pull.sh
+./build-zg.sh
+chmod -R 777 build/

mk/linux/zetaglest.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+export DBUS_FATAL_WARNINGS=0
+unset XMODIFIERS
+./build/zetaglest