diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-18 15:57:17 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-18 15:57:17 +0200 |
| commit | ccd4c504d53d438fa80ab7f0ecf1858c2ffbdd19 (patch) | |
| tree | 9d75f05742cdd30ee9ad24a2c6bbeb47cf07db5b | |
| parent | 147aaf326ff194bd8daa9ae1baadb971c0be0fe7 (diff) | |
| download | dragonfireclient-ccd4c504d53d438fa80ab7f0ecf1858c2ffbdd19.tar.xz | |
Ship dragonfireclient with selected high-quality mods
| -rw-r--r-- | clientmods/preview/mod.conf | 1 | ||||
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 11 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/clientmods/preview/mod.conf b/clientmods/preview/mod.conf deleted file mode 100644 index 23a5c3e90..000000000 --- a/clientmods/preview/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = preview diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index 4484b24a7..2418ffe8c 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -1,12 +1,14 @@ #!/bin/bash set -e -CORE_GIT=https://github.com/EliasFleckenstein03/dragonfireclient +GIT_ORG=https://github.com/dragonfireclient +CORE_GIT=$GIT_ORG/dragonfireclient CORE_BRANCH=master CORE_NAME=dragonfireclient GAME_GIT=https://git.minetest.land/MineClone2/MineClone2 GAME_BRANCH=master GAME_NAME=MineClone2 +CLIENT_MODS="autotool diglib digcustom nametags autokey autoeat invutil killaura worldutil physics_override noweather chateffects simpletp" dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then @@ -109,6 +111,13 @@ else [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \ git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME fi + rm -f clientmods/mods.conf + for mod in $CLIENT_MODS; do + cd $sourcedir + [ -d clientmods/$mod ] && { pushd clientmods/$mod; git pull; popd; } || \ + git clone $GIT_ORG/$mod clientmods/$mod + echo "load_mod_$mod = true" >> clientmods/mods.conf + done fi git_hash=$(cd $sourcedir && git rev-parse --short HEAD) diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index f367e68a5..c1e446d39 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -1,12 +1,14 @@ #!/bin/bash set -e -CORE_GIT=https://github.com/EliasFleckenstein03/dragonfireclient +GIT_ORG=https://github.com/dragonfireclient +CORE_GIT=$GIT_ORG/dragonfireclient CORE_BRANCH=master CORE_NAME=dragonfireclient GAME_GIT=https://git.minetest.land/MineClone2/MineClone2 GAME_BRANCH=master GAME_NAME=MineClone2 +CLIENT_MODS="autotool diglib digcustom nametags autokey autoeat invutil killaura worldutil physics_override noweather chateffects simpletp" dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then @@ -106,6 +108,13 @@ else [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \ git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME fi + rm -f clientmods/mods.conf + for mod in $CLIENT_MODS; do + cd $sourcedir + [ -d clientmods/$mod ] && { pushd clientmods/$mod; git pull; popd; } || \ + git clone $GIT_ORG/$mod clientmods/$mod + echo "load_mod_$mod = true" >> clientmods/mods.conf + done fi git_hash=$(cd $sourcedir && git rev-parse --short HEAD) |