tiny fix for data script [ci skip]

This commit is contained in:
filux 2015-11-10 22:15:36 +01:00
parent 884c11e41d
commit f6f05e4b9d
4 changed files with 4 additions and 5 deletions

View File

@ -36,6 +36,7 @@ notifications:
- "irc.freenode.org#megaglest"
skip_join: true
use_notice: true
on_success: change
template:
#- "[%{commit}: %{author}] %{message}"
#- "%{build_url}"

@ -1 +1 @@
Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26
Subproject commit c3ef4617d38e0062ab4835c5d5662a9580f1f095

View File

@ -15,9 +15,7 @@ else
CURRENTDIR="$(dirname "$(readlink -f "$0")")"
fi
cd "$CURRENTDIR"
if [ "$1" = "--show-result-path" ]; then
if [ "$2" != "" ]; then SOURCE_BRANCH="$2"; fi
fi
if [ "$1" != "" ] && [ "$2" != "" ]; then SOURCE_BRANCH="$2"; fi
VERSION=`./mg-version.sh --version`
REPODIR="$CURRENTDIR/../../"

View File

@ -30,7 +30,7 @@ mkdir -p "$APP_BIN_DIR"
./make-binary-archive.sh
cp -r "$RELEASEDIR_ROOT/$BINARY_DIR/"* "$APP_GAME_DIR"
../linux/make-data-archive.sh
cp -r "$RELEASEDIR_ROOT/$DATA_DIR/"* "$APP_GAME_DIR"; sleep 0.5s
cp -r "$DATA_DIR/"* "$APP_GAME_DIR"; sleep 0.5s
if [ -f "$APP_GAME_DIR/MegaGlest.sh" ]; then rm -f "$APP_GAME_DIR/MegaGlest.sh"; fi
cp "$CURRENTDIR/build/mk/macosx/bundle_resources/Info.plist" "$APP_PLIST_DIR"