New commits:
commit c397adc5948f80f503fd4175d42cb60011c115fa
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
cleanse: ignore spells removed during execution #15611
commit 0baec51818c035014183cd21c8e47eb43ae4f9c3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
sorcery: print all matches if nothing is specified to sorcery default
search #15413
diff --git a/ChangeLog b/ChangeLog
index 1574c41..cc2ab79 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
* alter.8: updated, adaptation of work from Donald Johnson #15478
* libmisc: use read -e for the second portion of query_string (#10707)
* libtablet: add roots and section name accessors
+ * sorcery: print all matches if nothing is specified to sorcery
default
+ search #15413
+ * cleanse: ignore spells removed during execution #15611
2011-08-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: fixed gaze from not finding "[", fixes #41
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 5374d47..8a72830 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -687,6 +687,11 @@ function cleanse_fix_run_checks() {
set_term_title "Checking $SPELL ($2 of $3)"
message "Checking ${SPELL_COLOR}${SPELL}${DEFAULT_COLOR} ($2 of $3)"
fi
+ if ! spell_installed $SPELL; then
+ message "${SPELL_COLOR}${SPELL}${MESSAGE_COLOR_COLOR}" \
+ "was dispelled in the meanwhile, skipping check!${DEFAULT_COLOR}"
+ return 0
+ fi
local VERSION=$(private_installed_version $SPELL)
cleanse_fix_find_check $SPELL $VERSION &&
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 15c804a..6cb8401 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1868,8 +1868,12 @@ sorcery_add_defaults () {
#---------------------------------------------------------------------
sorcery_search_defaults () {
# it wont hurt to look in both
- search_default_depends $DEFAULT_DEPENDS "$@"
- search_default_provider $DEFAULT_PROVIDERS "$@"
+ if [[ -z $1 ]]; then
+ cat $DEFAULT_DEPENDS $DEFAULT_PROVIDERS 2>/dev/null
+ else
+ search_default_depends $DEFAULT_DEPENDS "$@"
+ search_default_provider $DEFAULT_PROVIDERS "$@"
+ fi
}