From: Chris Koeritz Date: Sat, 11 Nov 2017 05:47:32 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.95^2~4 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9f01804cab69da8146d8b9900779801578c00341;hp=cc3e46e52acee7ade69ca475295dbb4c808ddb08;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev freakazoid, it's working --- diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index 6415cf1e..eab520cc 100644 --- a/production/feisty_meow_config.ini +++ b/production/feisty_meow_config.ini @@ -3,7 +3,7 @@ # specifies the version of the code that is being constructed here. major=2 minor=140 -revision=92 +revision=94 build=420 # specifies the remainder of the version record info. diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 80226899..c5a6fd36 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -34,7 +34,7 @@ if [ ! -d "$FEISTY_MEOW_SCRIPTS" -o ! -d "$FEISTY_MEOW_APEX" ]; then if [ -d "$FEISTY_MEOW_GENERATED_STORE" ]; then \rm -rf "$FEISTY_MEOW_GENERATED_STORE"; fi # also wipe any values from the variables pointing at generated stuff. unset FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_GENERATED_STORE - exec "$*" + exec $* fi ##############