diff --git a/love-release.sh b/love-release.sh index 9b4aee0..0443cb8 100755 --- a/love-release.sh +++ b/love-release.sh @@ -140,6 +140,7 @@ unset OPTOFS # Modules functions +## $1: Module name init_module () { unset OPTIND @@ -152,14 +153,15 @@ init_module () echo "Generating $PROJECT_NAME with Love $LOVE_VERSION for $1..." } +## $1: Compression level 0-9 create_love_file () { cd "$PROJECT_DIR" rm -rf "$RELEASE_DIR"/"$PROJECT_NAME".love 2> /dev/null if [ -z "$PROJECT_FILES" ]; then - zip -9 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ * + zip -$1 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ * else - zip -9 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ $PROJECT_FILES + zip -$1 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ $PROJECT_FILES fi cd "$RELEASE_DIR" LOVE_FILE="$PROJECT_NAME".love @@ -170,9 +172,11 @@ remove_love_file () rm -rf "$LOVE_FILE" } +## $1: exit code. 0 - success, other - failure +## $2: error message exit_module () { - if [ -z "$2" ]; then + if [ -z "$1" ] || [ "$1" = "0" ]; then echo "Done !" else echo -e "$2" diff --git a/scripts/android.sh b/scripts/android.sh index cf8d673..694b907 100644 --- a/scripts/android.sh +++ b/scripts/android.sh @@ -29,9 +29,6 @@ if [ "$activity_defined_argument" = false ]; then fi -create_love_file - - # Android MISSING_INFO=0 ERROR_MSG="Could not build Android package." @@ -49,6 +46,10 @@ if [ "$MISSING_INFO" -eq 1 ]; then exit_module "$MISSING_INFO" "$ERROR_MSG" fi + +create_love_file 0 + + LOVE_ANDROID_DIR="$CACHE_DIR"/love-android-sdl2 if [ -d "$LOVE_ANDROID_DIR" ]; then cd "$LOVE_ANDROID_DIR" diff --git a/scripts/debian.sh b/scripts/debian.sh index 42484ab..16c2cb8 100644 --- a/scripts/debian.sh +++ b/scripts/debian.sh @@ -26,9 +26,6 @@ if [ "$package_name_defined_argument" = false ]; then fi -create_love_file - - # Debian MISSING_INFO=0 ERROR_MSG="Could not build Debian package." @@ -57,6 +54,9 @@ if [ "$MISSING_INFO" -eq 1 ]; then fi +create_love_file 9 + + TEMP=`mktemp -d` mkdir -p $TEMP/DEBIAN diff --git a/scripts/love.sh b/scripts/love.sh index 88ba00a..d23c15a 100644 --- a/scripts/love.sh +++ b/scripts/love.sh @@ -1,7 +1,7 @@ # Love init_module "Love" -create_love_file +create_love_file 9 exit_module diff --git a/scripts/macosx.sh b/scripts/macosx.sh index fafc4ff..8297209 100644 --- a/scripts/macosx.sh +++ b/scripts/macosx.sh @@ -15,7 +15,7 @@ EXCLUDE_FILES="$EXCLUDE_FILES $PROJECT_ICNS" PACKAGE_NAME=$(echo $PROJECT_NAME | sed -e 's/[^-a-zA-Z0-9_]/-/g') -create_love_file +create_love_file 9 # Info.plist diff --git a/scripts/windows.sh b/scripts/windows.sh index 8fe5a90..2ce4c31 100644 --- a/scripts/windows.sh +++ b/scripts/windows.sh @@ -27,7 +27,7 @@ if [ "$FOUND_WINE" = true ] && [ -n "$PROJECT_ICO" ]; then fi -create_love_file +create_love_file 9 # Windows 32-bits