From 6e58597f369bfbb75cae4c82c446ec188ca22c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Mon, 15 Jun 2015 23:50:46 +0200 Subject: [PATCH] Small improvements, changed x86 to x32 --- conf.lua | 2 +- love-release.sh | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/conf.lua b/conf.lua index 36a5d3c..9c2578a 100644 --- a/conf.lua +++ b/conf.lua @@ -18,7 +18,7 @@ function love.conf(t) t.os = { "love", windows = { - x86 = true, + x32 = true, x64 = true, installer = false, appid = nil, diff --git a/love-release.sh b/love-release.sh index 83452d5..d6cbe84 100755 --- a/love-release.sh +++ b/love-release.sh @@ -205,11 +205,11 @@ else end if t.os.windows and os == "windows" then - t.os.windows.x86 = t.os.windows.x86 and true or false + t.os.windows.x32 = t.os.windows.x32 and true or false t.os.windows.x64 = t.os.windows.x64 and true or false t.os.windows.installer = t.os.windows.installer and true or false t.os.windows.appid = t.os.windows.appid or "" - print("X86="..tostring(t.os.windows.x86)) + print("X32="..tostring(t.os.windows.x32)) print("X64="..tostring(t.os.windows.x64)) print("INSTALLER="..tostring(t.os.windows.installer)) print("APPID="..t.os.windows.appid) @@ -217,13 +217,6 @@ end EOF ) eval "$var" - if [[ $(compare_version "$LOVE_VERSION" ">" "$VERSION") == true ]]; then - if [[ $(get_user_confirmation "LÖVE $LOVE_VERSION is out ! Your project uses LÖVE $VERSION. Continue ?") == false ]]; then - exit - fi - gen_version $VERSION - unset VERSION - fi fi } @@ -256,7 +249,6 @@ execute_module () { reset_vars local module="$1" - MODULE="$module" read_config "$module" module=${module^^} if [[ ${!module} == true ]]; then @@ -267,6 +259,13 @@ execute_module () DEFAULT_MODULE=false fi fi + if [[ $(compare_version "$LOVE_VERSION" ">" "$VERSION") == true ]]; then + if [[ $(get_user_confirmation "LÖVE $LOVE_VERSION is out ! Your project uses LÖVE $VERSION. Continue ?") == false ]]; then + exit + fi + gen_version $VERSION + unset VERSION + fi else reset_vars fi