Split script in two file

This commit is contained in:
mathusummut
2018-11-10 14:14:26 +01:00
parent 47bab8d0df
commit 39ae9e1b08
5 changed files with 24 additions and 17 deletions

View File

@@ -7,7 +7,6 @@
# Copyright (c) 2012-2017 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0 # Copyright (c) 2012-2017 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0
LANG=C LANG=C
echo
echo "Installing required dependencies...(requires root)" echo "Installing required dependencies...(requires root)"
echo echo

View File

@@ -8,7 +8,7 @@
# #
# Configuration section # Configuration section
# #
echo
echo "Building ZetaGlest..." echo "Building ZetaGlest..."
echo echo
@@ -320,8 +320,11 @@ else
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo 'ERROR: MAKE failed.' >&2; exit 2 echo 'ERROR: MAKE failed.' >&2; exit 2
fi fi
cd .. cd ..
if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then
chmod -R 777 build/
fi
echo '' echo ''
echo 'BUILD COMPLETE.' echo 'BUILD COMPLETE.'
echo '' echo ''

View File

@@ -5,4 +5,5 @@
# Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+ # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
./build-deps.sh ./build-deps.sh
echo
./build-zg-nodeps.sh ./build-zg-nodeps.sh

16
mk/linux/clone-data.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/bin/bash
echo "Downloading game data..."
currentDir=$PWD
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR
mkdir build
cd build
git clone https://github.com/ZetaGlest/zetaglest-data.git data
cd ..
if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then
chmod -R 777 build/
fi
cd $currentDir

View File

@@ -1,20 +1,8 @@
#!/bin/bash #!/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+
echo echo
echo "Initializing ZetaGlest setup..." echo "Initializing ZetaGlest setup..."
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" ./clone-data.sh
cd $DIR
echo echo
echo "Downloading game data..."
mkdir build
cd build
git clone https://github.com/ZetaGlest/zetaglest-data.git data
cd ..
./pull.sh ./pull.sh
echo
./build-zg.sh ./build-zg.sh
if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then
chmod -R 777 build/
fi