From cfa93f61d11de8a226bcc376662c67835c16ed37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Wed, 20 Aug 2014 09:33:21 +0200 Subject: [PATCH] Remove fallback to .love, print error msg instead. Fix doc. Close #10 --- README.md | 6 ++---- love-release.1 | 8 ++------ love-release.sh | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8cfd829..82071ac 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ Clone and run as root `install.sh`, or edit `install.sh` to choose locations in user-space. ### SYNOPSIS -`love-release.sh [-dlmw] [-n project_name] [-r release_dir] -[-u company_name] [-v love_version] [FILES...]` +`love-release.sh [-dglmw] [-n project_name] [-r release_dir] [-v love_version] [FILES...]` ### DESCRIPTION love-release.sh can be used to generate Love 2D game applications @@ -31,7 +30,7 @@ the script will use it to set the game icon on Windows. `--help` Print this longer help #### OPERATING SYSTEMS -`-a` Create an Android package. +`-g` 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), @@ -99,7 +98,6 @@ with eventual underscores (i.e. [a-zA-Z0-9\_]), otherwise you'll get errors. #### OTHERS `--clean` Clean the cache located in `~/.cache/love-release`. One can replace the Love files there. -`--debug` Dump the scripts variables without making releases. #### ICONS The script doesn’t yet handle the process of creating icons, diff --git a/love-release.1 b/love-release.1 index 75744b3..589b8d3 100644 --- a/love-release.1 +++ b/love-release.1 @@ -3,8 +3,7 @@ love-release.sh \- Bash script to generate Love 2D game releases .SH SYNOPSIS .B love\-release.sh -[\fB\-dlmw\fR] [\fB\-n\fR \fIproject_name\fR] [\fB\-r\fR \fIrelease_dir\fR] -[\fB\-u\fR \fIcompany_name\fR] [\fB\-v\fR \fIlove_version\fR] [\fIFILES...\fR] +[\fB\-dglmw\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 @@ -31,7 +30,7 @@ Print a short help Print this longer help .SH OPERATING SYSTEMS .TP -.B \-a +.B \-g 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, @@ -132,9 +131,6 @@ Set the version of your package. .B \-\-clean Clean the cache located in \fI~/.cache/love-release\fR. One can replace the Love files there. -.TP -.B \-\-debug -Dump the scripts variables without making releases. .SH ICONS The script doesn’t yet handle the process of creating icons, but if provided it can use them. diff --git a/love-release.sh b/love-release.sh index d22d452..9b4aee0 100755 --- a/love-release.sh +++ b/love-release.sh @@ -104,13 +104,16 @@ $SHORT_HELP" # Parsing options +missing_operands=true source "$INCLUDE_DIR"/getopt.sh while getoptex "$SCRIPT_ARGS" "$@" do if [ "$OPTOPT" = "h" ]; then echo "$SHORT_HELP" + exit elif [ "$OPTOPT" = "help" ]; then - : + man love-release + exit elif [ "$OPTOPT" = "n" ]; then PROJECT_NAME=$OPTARG elif [ "$OPTOPT" = "r" ]; then @@ -121,6 +124,7 @@ do LOVE_GT_080=$(float_test "$LOVE_VERSION_MAJOR >= 0.8") LOVE_GT_090=$(float_test "$LOVE_VERSION_MAJOR >= 0.9") elif [ "$OPTOPT" = "clean" ]; then + missing_operands=false rm -rf "$MAIN_CACHE_DIR" fi done @@ -215,9 +219,11 @@ do done - -# Fallback if nothing is specified -init_module "Love" -create_love_file -exit_module +# 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...] +Try 'love-release.sh --help' for more information." + exit 1 +fi