From 83a5f111b7d2b9044c22d7c31eb416c30e4d68eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Wed, 20 Aug 2014 22:32:28 +0200 Subject: [PATCH] Moved back -g option to -a --- README.md | 4 ++-- love-release.1 | 4 ++-- love-release.sh | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3e73b19..1415d7e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Clone and run as root `install.sh`, or edit `install.sh` to choose locations in user-space. ### SYNOPSIS -`love-release.sh [-dglmw] [-n project_name] [-r release_dir] [-v love_version] [FILES...]` +`love-release.sh [-adlmw] [-n project_name] [-r release_dir] [-v love_version] [FILES...]` ### DESCRIPTION love-release.sh can be used to generate Love 2D game applications @@ -30,7 +30,7 @@ the script will use it to set the game icon on Windows. `--help` Print this longer help #### OPERATING SYSTEMS -`-g` Create an Android package. +`-a` Create an Android package. In order to create an Android package, you must have installed the Android SDK. See [Building LÖVE for Android](https://bitbucket.org/MartinFelis/love-android-sdl2/wiki/Building_L%C3%96VE_for_Android_-_Linux), but there is no need to install the [LÖVE port to Android](https://bitbucket.org/MartinFelis/love-android-sdl2), diff --git a/love-release.1 b/love-release.1 index 4b32bd7..6eef0e3 100644 --- a/love-release.1 +++ b/love-release.1 @@ -3,7 +3,7 @@ love-release.sh \- Bash script to generate Love 2D game releases .SH SYNOPSIS .B love\-release.sh -[\fB\-dglmw\fR] [\fB\-n\fR \fIproject_name\fR] [\fB\-r\fR \fIrelease_dir\fR] [\fB\-v\fR \fIlove_version\fR] [\fIFILES...\fR] +[\fB\-adlmw\fR] [\fB\-n\fR \fIproject_name\fR] [\fB\-r\fR \fIrelease_dir\fR] [\fB\-v\fR \fIlove_version\fR] [\fIFILES...\fR] .SH DESCRIPTION .B love-release.sh can be used to generate Love 2D game applications @@ -30,7 +30,7 @@ Print a short help Print this longer help .SH OPERATING SYSTEMS .TP -.B \-g +.B \-a Create an Android package. In order to create an Android package, you must have installed the Android SDK, but there is no need to install the LÖVE port to Android, diff --git a/love-release.sh b/love-release.sh index 6c235f8..0cfbfbc 100755 --- a/love-release.sh +++ b/love-release.sh @@ -23,7 +23,7 @@ SCRIPT_ARGS="w. icon: $SCRIPT_ARGS" SCRIPT_ARGS="d; package-version: maintainer-name: maintainer-email: homepage: description: package-name: $SCRIPT_ARGS" ## Android -SCRIPT_ARGS="g; activity: package-version: maintainer-name: package-name: update-android; $SCRIPT_ARGS" +SCRIPT_ARGS="a; activity: package-version: maintainer-name: package-name: update-android; $SCRIPT_ARGS" ## Mac OS X SCRIPT_ARGS="m; icon: maintainer-name: $SCRIPT_ARGS" @@ -33,8 +33,8 @@ SCRIPT_ARGS="m; icon: maintainer-name: $SCRIPT_ARGS" ## SHORT_HELP=" -a Create an executable for a ## --osname Create an executable for osname" SHORT_HELP=" -l Create a plain Love file + -a Create an Android package -d Create a Debian package - -g Create an Android package -m Create a Mac OS X application -w, Create a Windows application -w32 Create a Windows x86 application @@ -201,10 +201,10 @@ do ## fi if [ "$OPTOPT" = "l" ]; then source "$PLATFORMS_DIR"/love.sh + elif [ "$OPTOPT" = "a" ]; then + source "$PLATFORMS_DIR"/android.sh elif [ "$OPTOPT" = "d" ]; then source "$PLATFORMS_DIR"/debian.sh - elif [ "$OPTOPT" = "g" ]; then - source "$PLATFORMS_DIR"/android.sh elif [ "$OPTOPT" = "m" ]; then source "$PLATFORMS_DIR"/macosx.sh elif [ "$OPTOPT" = "w" ]; then @@ -224,7 +224,7 @@ done # Missing operands if [ "$missing_operands" = true ]; then >&2 echo "./love-release.sh: missing operands. -love-release.sh [-dglmw] [-n project_name] [-r release_dir] [-v love_version] [FILES...] +love-release.sh [-adlmw] [-n project_name] [-r release_dir] [-v love_version] [FILES...] Try 'love-release.sh --help' for more information." exit 1 fi