- [ -n "$UNKNOWN" ] &&
- message "Unknown Spells or Sections" &&
- message "--------------------------" &&
- message "$UNKNOWN"
+ if [[ -n $UNKNOWN ]]; then
+ message "Unknown Spells or Sections"
+ message "--------------------------"
+ message "$UNKNOWN"
+ return 1
+ else
+ return 0
+ fi
}
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index c8803ee..debaac5 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -292,7 +292,8 @@ function run_spell_success() {
lock_file "$spell_config_stage"
if [[ $STAGED_INSTALL != "off" && -d $spell_config_stage/current ]]
then
- if ! rmdir $spell_config_stage/current $spell_config_stage
2>/dev/null;
+ rmdir $spell_config_stage/current $spell_config_stage 2>/dev/null
+ if [[ -d $spell_config_stage/current ]]
then
# check if a config we staged was already staged and if so, remove
it.
# this way users don't have to merge the same old default config
again
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (a53bb4735ca2d6a5204c4ea0fa99a28c5e5bbff0),
Jaka Kranjc, 02/22/2008