tiny fix for data script [ci skip]
This commit is contained in:
parent
884c11e41d
commit
f6f05e4b9d
|
@ -36,6 +36,7 @@ notifications:
|
||||||
- "irc.freenode.org#megaglest"
|
- "irc.freenode.org#megaglest"
|
||||||
skip_join: true
|
skip_join: true
|
||||||
use_notice: true
|
use_notice: true
|
||||||
|
on_success: change
|
||||||
template:
|
template:
|
||||||
#- "[%{commit}: %{author}] %{message}"
|
#- "[%{commit}: %{author}] %{message}"
|
||||||
#- "%{build_url}"
|
#- "%{build_url}"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26
|
Subproject commit c3ef4617d38e0062ab4835c5d5662a9580f1f095
|
|
@ -15,9 +15,7 @@ else
|
||||||
CURRENTDIR="$(dirname "$(readlink -f "$0")")"
|
CURRENTDIR="$(dirname "$(readlink -f "$0")")"
|
||||||
fi
|
fi
|
||||||
cd "$CURRENTDIR"
|
cd "$CURRENTDIR"
|
||||||
if [ "$1" = "--show-result-path" ]; then
|
if [ "$1" != "" ] && [ "$2" != "" ]; then SOURCE_BRANCH="$2"; fi
|
||||||
if [ "$2" != "" ]; then SOURCE_BRANCH="$2"; fi
|
|
||||||
fi
|
|
||||||
VERSION=`./mg-version.sh --version`
|
VERSION=`./mg-version.sh --version`
|
||||||
|
|
||||||
REPODIR="$CURRENTDIR/../../"
|
REPODIR="$CURRENTDIR/../../"
|
||||||
|
|
|
@ -30,7 +30,7 @@ mkdir -p "$APP_BIN_DIR"
|
||||||
./make-binary-archive.sh
|
./make-binary-archive.sh
|
||||||
cp -r "$RELEASEDIR_ROOT/$BINARY_DIR/"* "$APP_GAME_DIR"
|
cp -r "$RELEASEDIR_ROOT/$BINARY_DIR/"* "$APP_GAME_DIR"
|
||||||
../linux/make-data-archive.sh
|
../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
|
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"
|
cp "$CURRENTDIR/build/mk/macosx/bundle_resources/Info.plist" "$APP_PLIST_DIR"
|
||||||
|
|
Loading…
Reference in New Issue