From 9830124a312a54e02f595b52c5b92abfcb166890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Sat, 13 Jun 2015 14:16:02 +0200 Subject: [PATCH] Include scripts/love.sh into main script --- love-release.sh | 18 +++++++++++++++++- scripts/love.sh | 7 ------- 2 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 scripts/love.sh diff --git a/love-release.sh b/love-release.sh index f9509db..8b8eb33 100755 --- a/love-release.sh +++ b/love-release.sh @@ -251,6 +251,13 @@ execute_module () local module="$1" read_config "$module" module=${module^^} + if [[ ${!module} == true && -z $DEFAULT_MODULE ]]; then + if [[ ${module} == "LOVE" ]]; then + DEFAULT_MODULE=true + else + DEFAULT_MODULE=false + fi + fi echo "${!module}" } @@ -302,6 +309,8 @@ gen_version $LOVE_WEB_VERSION INSTALLED=false EMBEDDED=false +DEFAULT_MODULE= + if [[ $INSTALLED == false && $EMBEDDED == false ]]; then >&2 echo "love-release has not been installed, and is not embedded into one script. Consider doing one of the two." INSTALLED=true @@ -313,9 +322,16 @@ elif [[ $INSTALLED == true ]]; then SCRIPTS_DIR="scripts" for file in "$SCRIPTS_DIR"/*.sh; do MODULE="$(basename -s '.sh' "$file")" - if [[ $(execute_module "$1") == true ]]; then + if [[ $(execute_module "$MODULE") == true ]]; then source "$file" fi done fi +if [[ -z $DEFAULT_MODULE || $DEFAULT_MODULE == true ]]; then + MODULE="love" + init_module + create_love_file 9 + exit_module +fi + diff --git a/scripts/love.sh b/scripts/love.sh deleted file mode 100644 index d23c15a..0000000 --- a/scripts/love.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Love -init_module "Love" - -create_love_file 9 - -exit_module -