Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (3701246c74ef91803b836feb8238b67d1cd44dd1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (3701246c74ef91803b836feb8238b67d1cd44dd1)
  • Date: Sat, 1 Jul 2006 13:12:29 -0500

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 32 +++
convert | 2
etc/sorcery/config | 24 +-
usr/sbin/alter | 14 -
usr/sbin/cast | 14 -
usr/sbin/cleanse | 98 +++++-----
usr/sbin/dispel | 94 +++++-----
usr/sbin/gaze | 285
+++++++++++++++----------------
usr/sbin/scribbler | 10 -
usr/sbin/scribe | 30 +--
usr/sbin/sorcery | 96 +++++-----
usr/sbin/summon | 26 +-
var/lib/sorcery/modules/build_api/common | 10 -
var/lib/sorcery/modules/libapi | 20 +-
var/lib/sorcery/modules/libcast | 2
var/lib/sorcery/modules/libcodex | 24 +-
var/lib/sorcery/modules/libdepends | 20 +-
var/lib/sorcery/modules/libdispel | 8
var/lib/sorcery/modules/libdownload | 2
var/lib/sorcery/modules/libhash | 2
var/lib/sorcery/modules/liblock | 58 +++---
var/lib/sorcery/modules/libmisc | 22 +-
var/lib/sorcery/modules/libresurrect | 20 +-
var/lib/sorcery/modules/libscreen | 6
var/lib/sorcery/modules/libsecurity | 4
var/lib/sorcery/modules/libsorcery | 18 -
var/lib/sorcery/modules/libstage | 26 +-
var/lib/sorcery/modules/libtablet | 2
var/lib/sorcery/modules/libtrack | 2
var/lib/sorcery/modules/libunpack | 2
var/lib/sorcery/modules/liburl | 16 -
31 files changed, 511 insertions(+), 478 deletions(-)

New commits:
commit 3701246c74ef91803b836feb8238b67d1cd44dd1
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added changelog entry for white space fixing

commit a62d8c53bbb4ce3a6da0bedcdaae2aa9d16442b1
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in liburl

commit 4141826f7c7bc21f4e682821c06e40ecc40c54d9
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libunpack

commit a1231301e6c7ee2ea4e818a0cb90939e7980c567
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libtrack

commit 8c30a95ab8a670731fb88f94b9fa6ca3cda97680
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libtablet

commit 9e1103b3d0a355a340a54d2427293fa046c58d40
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libstage

commit 730ca6c2bf581eb550321a3b99af73b41e8aadbd
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libsorcery

commit f16d0bf4480c5517bf720835a12de677c40c6231
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libsecurity

commit 27b802a58fec54adeb04877810d8566b11aea2b0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libscreen

commit 347d68273bfb295dda029245d3557927288e7087
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libresurrect

commit 0873e9a6506a2b8be136bca57d27712c66ccd045
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libmisc

commit f25a9313fafb2e5d9d144aa41ba6369b0ca1d795
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in liblock

commit f5b9adc25204d4816f7e8e801deeca9a56661235
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libhash

commit 5e0e6a5c65f8d14443ed69cfee15c43decd69f0e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libdownload

commit b5380a13ccde9d5e7e9fa2281cbb04f2bd63ad86
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libdispel

commit 895cd983d5e58bd728db7f27b6e99dbd952016b0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libdepends

commit f660508dd258f09a1a34a5469234be5abb47600b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libcodex

commit 59a20a2e66d8491ab18bbc2fd8ada35364a83bd3
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libcast

commit 092dff7a270690904238b5db4f7201aaa7dd90be
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in libapi

commit 8583fc43eed7e9f990916ddd6d90ca8744b21ad0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in common

commit 4bf89961f52949b32f19281ff75fee5c7136222b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in summon

commit 787dc28ef2b8005d0d968e0d1b764731046dac23
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in sorcery

commit f329349a7600266b570c204ad88cde349c900e15
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in scribe

commit 6e98b9ed2f69444e20ecf7ceb950a20cfcff2c9f
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in scribbler

commit 690a6df780dfebddad016225b94c9ae726d4333e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in gaze

commit d09bc8c9689f7bb767df8e33dab4f8b11aa84957
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in dispel

commit 8a6061e1229eab0f9604cc9cf408b79b552a2cfc
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in cleanse

commit 15a43af53e6a5c0ab2cd61ca51dc32709db9e3ea
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in cast

commit 6e5b530a6ce342ba290b8b52067ce0fa95f8d71f
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in alter

commit d98a125b5182a4dea51e2ce0c9fe1e9d4e83627f
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in config

commit 695bf5c0bffc86cbcf0276ddecdff78791a9cb7b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed whitespace in convert

diff --git a/ChangeLog b/ChangeLog
index 999c538..462b1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,36 @@
2006-07-01 David Brown <dmlb2000 AT gmail.com>
+ * convert: fixed whitespace removed tabs
+ * etc/sorcery/config: fixed whitespace removed tabs
+ * alter: fixed whitespace removed tabs
+ * cast: fixed whitespace removed tabs
+ * cleanse: fixed whitespace removed tabs
+ * dispel: fixed whitespace removed tabs
+ * gaze: fixed whitespace removed tabs
+ * scribbler: fixed whitespace removed tabs
+ * scribe: fixed whitespace removed tabs
+ * sorcery: fixed whitespace removed tabs
+ * summon: fixed whitespace removed tabs
+ * build_api/common: fixed whitespace removed tabs
+ * libapi: fixed whitespace removed tabs
+ * libcast: fixed whitespace removed tabs
+ * libcodex: fixed whitespace removed tabs
+ * libdepends: fixed whitespace removed tabs
+ * libdispel: fixed whitespace removed tabs
+ * libdownload: fixed whitespace removed tabs
+ * libhash: fixed whitespace removed tabs
+ * liblock: fixed whitespace removed tabs
+ * libmisc: fixed whitespace removed tabs
+ * libresurrect: fixed whitespace removed tabs
+ * libscreen: fixed whitespace removed tabs
+ * libsecurity: fixed whitespace removed tabs
+ * libsorcery: fixed whitespace removed tabs
+ * libstage: fixed whitespace removed tabs
+ * libtablet: fixed whitespace removed tabs
+ * libtrack: fixed whitespace removed tabs
+ * libunpack: fixed whitespace removed tabs
+ * liburl: fixed whitespace removed tabs
+
+2006-07-01 David Brown <dmlb2000 AT gmail.com>
* libsorcery: update_install_queue added progress bar so we have
some idea of how long it takes to queue up spells

diff --git a/convert b/convert
index 4b3320f..a26b1bf 100755
--- a/convert
+++ b/convert
@@ -1,6 +1,6 @@
#!/bin/bash

-SORCERY_VERSION=`gaze installed sorcery`
+SORCERY_VERSION=`gaze installed sorcery`
. /etc/sorcery/config

case $SORCERY_URL in
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 37cef26..7baa0bb 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -175,21 +175,21 @@ PROGRESS_SPINNER_CHARS='-\|/'
DOCUMENT_DIRECTORY=${INSTALL_ROOT}/usr/share/doc
CONFIG_STAGE_DIRECTORY=${STATE_ROOT}/var/state/sorcery/staged_configs

- # this is passed directly to installwatch so it can't contain
- # shell expansions or regex's
+ # this is passed directly to installwatch so it can't contain
+ # shell expansions or regex's
INSTALLWATCH_UNSTAGED_PATHS=""
for dir in /dev \
/proc \
- /tmp \
- /var/tmp \
- /sys \
- ${BUILD_DIRECTORY} \
- ${SGL_LIBRARY} \
- ${INSTALL_ROOT}/${SGL_LIBRARY} \
- ${SOURCE_CACHE} \
- ${CONFIG_CACHE} \
- ${STATE_DIRECTORY} \
- ${LOG_DIRECTORY} ; do
+ /tmp \
+ /var/tmp \
+ /sys \
+ ${BUILD_DIRECTORY} \
+ ${SGL_LIBRARY} \
+ ${INSTALL_ROOT}/${SGL_LIBRARY} \
+ ${SOURCE_CACHE} \
+ ${CONFIG_CACHE} \
+ ${STATE_DIRECTORY} \
+ ${LOG_DIRECTORY} ; do
INSTALLWATCH_UNSTAGED_PATHS="${INSTALLWATCH_UNSTAGED_PATHS}${dir},"
done
INSTALLWATCH_UNSTAGED_PATHS=${INSTALLWATCH_UNSTAGED_PATHS%,}
diff --git a/usr/sbin/alter b/usr/sbin/alter
index e91e1d6..73912f6 100755
--- a/usr/sbin/alter
+++ b/usr/sbin/alter
@@ -529,13 +529,13 @@ alter: usage:
EOF

case "$1" in
- -m|--md5mend ) shift; alter_md5mend "$@" ;;
- -p|--prelink ) shift; alter_prelink "$@" ;;
- -s|--strip ) shift; alter_strip "$@" ;;
- -z|--strip-all ) shift; alter_strip_all "$@" ;;
- -a|--alter ) shift; alter_alter "$@" ;;
- -h|--about|--help ) shift; alter_about "$@" ;;
- -n|--spell|-v|--version|* ) alter_alter "$@" ;;
+ -m|--md5mend ) shift; alter_md5mend "$@" ;;
+ -p|--prelink ) shift; alter_prelink "$@" ;;
+ -s|--strip ) shift; alter_strip "$@" ;;
+ -z|--strip-all ) shift; alter_strip_all "$@" ;;
+ -a|--alter ) shift; alter_alter "$@" ;;
+ -h|--about|--help ) shift; alter_about "$@" ;;
+ -n|--spell|-v|--version|* ) alter_alter "$@" ;;
esac

}
diff --git a/usr/sbin/cast b/usr/sbin/cast
index 7ea72a8..fa4b7e0 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -58,13 +58,13 @@ Optional Parameters:
could optionally depend on it, but those
dependencies are disabled, ask to recast
the dependee. Optional parameter can be
- option can be one of: "always", "ask-yes",
- "ask-no", or "ignore"; it defaults to what
- is set via the sorcery menu.
+ option can be one of: "always", "ask-yes",
+ "ask-no", or "ignore"; it defaults to what
+ is set via the sorcery menu.

-Z | --lazy-updates [option] Perform updates on installed spells that
- need updates. Optional parameter same as
- above.
+ need updates. Optional parameter same as
+ above.

-b | --force-base-dep Force all spells to depend on basesystem

@@ -742,7 +742,7 @@ function int_trap()
if [[ $SCREEN_NAME ]] ; then
message -n "Press a key to exit screen."
read -n 1
- screen_quit "$SCREEN_NAME"
+ screen_quit "$SCREEN_NAME"
fi
exit 1
}
@@ -908,7 +908,7 @@ else
then
touch $DEBUG
screen_new_window "$SCREEN_NAME" $SCREEN_DEBUG_WIN "Debug" \
- tail -f -n 0 -s 0.1 $DEBUG
+ tail -f -n 0 -s 0.1 $DEBUG
#screen_unmonitor_window "$SCREEN_NAME" $SCREEN_DEBUG_WIN
fi

diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 98e66e3..6ba1b5a 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -35,44 +35,44 @@ ## @Stdout Usage statement
#--------------------
function usage()
{
- local s=$(basename $0)
+ local s=$(basename $0)
cat << EOF
Invoke $s with one of the arguments below.

-Command Description
---delint Finds stale dependency entries
---delint full will delint dependencies that are off
---prune Finds dispeled spells that should be cast
---prune doit will cause it to actually cast and dispel
---packages find bad entries in the installed spells file
+Command Description
+--delint Finds stale dependency entries
+--delint full will delint dependencies that are off
+--prune Finds dispeled spells that should be cast
+--prune doit will cause it to actually cast and dispel
+--packages find bad entries in the installed spells file

---fix attempts to detect errors in cast spells and recasts broken
ones
---nofix attempts to detect errors in cast spells but does not
recast
---nofix_quick like --nofix, but does not check dependent spells.
+--fix attempts to detect errors in cast spells and recasts broken
ones
+--nofix attempts to detect errors in cast spells but does not recast
+--nofix_quick like --nofix, but does not check dependent spells.

---tablet clean up the tablet
---tablet_spell clean up the tablet for one spell
---logs cleans old logs in the same way a system-update does
+--tablet clean up the tablet
+--tablet_spell clean up the tablet for one spell
+--logs cleans old logs in the same way a system-update does

---sweep Clean out old downloaded sources and cached binaries
- old is defined as not capable of being used by any
- spell/version in any grimoire on the system.
+--sweep Clean out old downloaded sources and cached binaries
+ old is defined as not capable of being used by any
+ spell/version in any grimoire on the system.

---sweep_all Clean out old downloaded sources and cached binaries
- old is defined as not capable of being used by any spell
- installed on the system. Only the first version of the
- spell found is used.
+--sweep_all Clean out old downloaded sources and cached binaries
+ old is defined as not capable of being used by any spell
+ installed on the system. Only the first version of the
+ spell found is used.

It is suggested that you try the following order the first time:
- 1) $s --packages
- 2) $s --delint
- 3) $s --tablet
- 4) $s --logs
- 5) $s --prune
- 6) $s --sweep
- 7) $s --fix
+ 1) $s --packages
+ 2) $s --delint
+ 3) $s --tablet
+ 4) $s --logs
+ 5) $s --prune
+ 6) $s --sweep
+ 7) $s --fix
EOF
- [[ $# -gt 0 ]] && echo "Unknown $*"
+ [[ $# -gt 0 ]] && echo "Unknown $*"
}


@@ -318,8 +318,8 @@ function prune_depends()
Installed[$1] = 1;
}
$3=="on"{
- if($2 ~ "[(].*[)]")
- prov=gensub("^.*\\((.*)\\).*$", "\\1", 1, $2);
+ if($2 ~ "[(].*[)]")
+ prov=gensub("^.*\\((.*)\\).*$", "\\1", 1, $2);
else
prov="__BLANK__";
gsub("\\(.*\\)", "", $2)
@@ -332,31 +332,31 @@ function prune_depends()
while [ $# -gt 0 ] ; do
options=()
message "$1 needs $2 ($3)."
-
- # Check if the dependency is a provider. IF so, the SA may have
switched
- # to another provider and should be given the option to recast with
the
- # new provider
- if [[ $4 != __BLANK__ ]] ; then
- message -n "$2 used to provide $4. Now "
- local CANDIDATES=$( find_providers $4 )
- provider=""
+
+# Check if the dependency is a provider. IF so, the SA may have switched
+# to another provider and should be given the option to recast with the
+# new provider
+ if [[ $4 != __BLANK__ ]] ; then
+ message -n "$2 used to provide $4. Now "
+ local CANDIDATES=$( find_providers $4 )
+ provider=""
for spell in $CANDIDATES; do
if spell_installed $spell || spell_held $spell; then
- local provider=$spell
- break
- fi
+ local provider=$spell
+ break
+ fi
done


if [[ ${provider} ]] ; then
message -n "$provider "
- options=( "Switch from $2 to ${provider} and recompile" )
+ options=( "Switch from $2 to ${provider} and recompile" )
else
message -n "${PROBLEM_COLOR}no one${DEFAULT_COLOR} "
- fi
- message "provides it."
+ fi
+ message "provides it."
fi
-
+
# If the spell is optional, then the dependency can be removed and the
spell recast
# If it's required, then it can't be removed
if [[ $3 == required ]] ; then
@@ -376,10 +376,10 @@ function prune_depends()
sed 's/^\('$1':'$2':\)on\(:optional:.*\)$/\1off\2/' $DEPENDS_STATUS
> $TMP_DIR/prune.1
mv $TMP_DIR/prune.1 $DEPENDS_STATUS
;;
- S*) sed 's/^\('$1':\)'$2'\(('$4'):.*\)$/\1'$provider'\2/'
$DEPENDS_STATUS > $TMP_DIR/prune.1
- mv $TMP_DIR/prune.1 $DEPENDS_STATUS
- echo $1 >>$TMP_DIR/prune.cast
- ;;
+ S*) sed 's/^\('$1':\)'$2'\(('$4'):.*\)$/\1'$provider'\2/'
$DEPENDS_STATUS > $TMP_DIR/prune.1
+ mv $TMP_DIR/prune.1 $DEPENDS_STATUS
+ echo $1 >>$TMP_DIR/prune.cast
+ ;;
*) message "We should never get here."
exit 1
;;
diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index 1adee29..860f8fc 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -10,63 +10,63 @@ ##
#---------------------------------------------------------------------


-help() {
+help() {

cat << EOF

Dispel uninstalls single or multiple spells.

-Example: dispel hdparm vim emacs
-Usage: dispel [parameters] [spells]
+Example: dispel hdparm vim emacs
+Usage: dispel [parameters] [spells]

Optional Parameters:

-e | --exile spell Removes spells and blocks them
from being automatically reinstalled.
-
+
-d | --downgrade spell version
- Removes the spell and reinstalls
- the selected version from cache
-
---notriggers Disables triggers for this dispel
---nosustain Turns off dispel protection for vital spells
- (you usually don't want to do this)
---noreap Dispels spells but doesn't remove its files
---no-reap-depends Dont remove dependency information, dont use this
- unless you know exactly what you are doing, and
- dont complain if it breaks your box.
-
---total-dispel Remove everything including config files even
- if they were modified.
+ Removes the spell and reinstalls
+ the selected version from cache
+
+--notriggers Disables triggers for this dispel
+--nosustain Turns off dispel protection for vital spells
+ (you usually don't want to do this)
+--noreap Dispels spells but doesn't remove its files
+--no-reap-depends Dont remove dependency information, dont use this
+ unless you know exactly what you are doing, and
+ dont complain if it breaks your box.
+
+--total-dispel Remove everything including config files even
+ if they were modified.

The following parameters effect dependency following, if they are not
specified the default action is to do no dependency following. For
a more in-depth explaination refer to the manual

- The following 5 parameters accept one of the following
- 4 parameters:
- ignore, ask-yes, ask-no, always
+ The following 5 parameters accept one of the
following
+ 4 parameters:
+ ignore, ask-yes, ask-no, always

---orphan Default action for dispelling a newly orphaned child
- spell.
---non-orphan Default action for dispelling a dependee of
- another spell, that is not an orphan (doing this
- will break the spells that still depend on it).
+--orphan Default action for dispelling a newly orphaned child
+ spell.
+--non-orphan Default action for dispelling a dependee of
+ another spell, that is not an orphan (doing this
+ will break the spells that still depend on it).

---child Default action for dispelling a child spell
that
- is either an orphan or non-orphan.
+--child Default action for dispelling a child spell that
+ is either an orphan or non-orphan.

---recast-parent If a spell has a child removed from under it,
the
- spell is considered broken, if all of the removed
- children are optional, the spell may be recast
- without those depends. This option controls the
- default for this action.
---dispel-parent Default action for dispelling broken parents,
- the user is asked for recasting if possible first.
+--recast-parent If a spell has a child removed from under it, the
+ spell is considered broken, if all of the removed
+ children are optional, the spell may be recast
+ without those depends. This option controls the
+ default for this action.
+--dispel-parent Default action for dispelling broken parents,
+ the user is asked for recasting if possible first.

---user-deps Use defaults for dependency following from the
---user-child-deps sorcery menu for child and/or parent dependency
---user-parent-deps following.
+--user-deps Use defaults for dependency following from the
+--user-child-deps sorcery menu for child and/or parent dependency
+--user-parent-deps following.

EOF

@@ -369,10 +369,10 @@ ## Common code for querying the user abo
## Prints a message and asks a query, if ask-yes or ask-no is the
## provided action.
##
-## @param Spell in question
-## @param Message a short message about the state of the spell
-## @param Question to ask the user
-## @param quad-option (always, ask-yes, ask-no, ignore)
+## @param Spell in question
+## @param Message a short message about the state of the spell
+## @param Question to ask the user
+## @param quad-option (always, ask-yes, ask-no, ignore)
#---------------------------------------------------------------------
function dispel_child_query() {
local SPELL=$1
@@ -404,8 +404,8 @@ #---------------------------------------
## Common code for querying the user about parents spells.
## Asks a query, if ask-yes or ask-no is the provided action.
##
-## @param Question to ask the user
-## @param quad-option (always, ask-yes, ask-no, ignore)
+## @param Question to ask the user
+## @param quad-option (always, ask-yes, ask-no, ignore)
#---------------------------------------------------------------------
function dispel_parent_query() {
local QUERY=$1
@@ -450,9 +450,9 @@ function remove_from_dep_trees() {
}

#---------------------------------------------------------------------
-## @param Spell to find borked parents for
-## @param Name of upward dependency hash
-## @param Name of hash to accumulate borked parents in
+## @param Spell to find borked parents for
+## @param Name of upward dependency hash
+## @param Name of hash to accumulate borked parents in
##
## Find the spells that the following spell borks.
##
@@ -477,7 +477,7 @@ ## tree downwards for all the provided s
## borked parents. The caller is expected to call this repeatedly until
## there are no borked parents to remove.
##
-## @param List of spells to remove on this iteration.
+## @param List of spells to remove on this iteration.
#---------------------------------------------------------------------
function dispel_depends_engine() {

diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index f7601f3..8c6766a 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -14,105 +14,106 @@ cat << EOF
Invoke gaze with desired command followed by arguments.
Please note that anything in brackets [] is optional.

-Command Arguments Description
+Command Arguments Description

--q <empty> disables human style output
+-q <empty> disables human style output

-alien <empty> Discovers untracked files.
-from path/file Discovers what installed a file.
+alien <empty> Discovers untracked files.
+from path/file Discovers what installed a file.

-search "phrase" Searches for "phrase" in the long and short
- spell descriptions and in the spell name.
-search -name "phrase" Searches for "phrase" in the spell name.
-search -short "phrase" Searches for "phrase" in the short spell
- descriptions
+search "phrase" Searches for "phrase" in the long and short
+ spell descriptions and in the spell name.
+search -name "phrase" Searches for "phrase" in the spell name.
+search -short "phrase" Searches for "phrase" in the short spell
+ descriptions

-provides feature Displays spells that provide the feature.
+provides feature Displays spells that provide the feature.

-what spell Prints the spell's description.
+what spell Prints the spell's description.
short spell Prints the spell's short description.
-where -path spell Prints the spell's section or full path.
-website | url spell Prints the spell's website.
-install spell Views an install log, and sorcery log
files for to the spell.
-install-full spell Views an install log including all
sorcery state files.
-install-spell spell Views an install log without any
sorcery files included.
-installed [spell] Views installed spells.
-version spell Views version of spell installed,
- and version in the grimoire.
-versions spell Views version of spell in all grimoires
-patchlevels spell Views PATCHLEVEL and SECURITY_PATCH value
- of spell in all grimoires
-license spell Views the license of the given
spell(s)
-license section Views the licenses of spells in the
given
- section(s)
-license license Views information about the given
license(s).
-compile spell [version] Views a compile log. If no optional
version
- was given, try the installed version,
- if the spell is not installed use the
- version in the grimoire.
-sources spell Lists the source files for a spell.
-source_urls spell Lists the source urls for a spell.
-history spell Shows history for a spell.
-
-sum [spell] Prints checksums.
-md5sum [spell] Prints md5sums.
-size spell Prints total size of all files installed
- by this spell
-export Makes snapshot of box's configuration.
-import snapshot Restores snapshot.
-
-section [section] Lists all sections. Or all spells in
- the specified section.
-maintainer [section] Lists who is the maintainer for a section
-grimoire [grimoire] Views a text listing of all grimoires.
- Or of the specified grimoire.
-grimoires Views list of installed grimoires' names
-html [-s] [grimoire] Views a html listing of all grimoires.
- Or of the specified grimoire.
- Additionally displays links to the source
- files when -s is given.
-
-newer 20020521 Shows available spells newer than May 21,
2002.
-older 20010521 Shows spells installed before May 21, 2001.
-newer last_sorcery_update Shows spells newer than your previous sorcery
update
-newer last_cast Shows spells newer than your last casting
-
-voyeur [delay or spell]
- Peeks into spell compilation.
-
-orphans <empty> Displays installed spells that no
installed
- spells explicitly depend on.
-
-depends [--fast] spell [level]
+where -path spell Prints the spell's section or full path.
+website | url spell Prints the spell's website.
+install spell Views an install log, and sorcery log files
for to the spell.
+install-full spell Views an install log including all sorcery
state files.
+install-spell spell Views an install log without any sorcery
files included.
+installed [spell] Views installed spells.
+version spell Views version of spell installed,
+ and version in the grimoire.
+versions spell Views version of spell in all grimoires
+patchlevels spell Views PATCHLEVEL and SECURITY_PATCH value
+ of spell in all grimoires
+license spell Views the license of the given spell(s)
+license section Views the licenses of spells in the given
+ section(s)
+license license Views information about the given license(s).
+compile spell [version] Views a compile log. If no optional version
+ was given, try the installed version,
+ if the spell is not installed use the
+ version in the grimoire.
+sources spell Lists the source files for a spell.
+source_urls spell Lists the source urls for a spell.
+history spell Shows history for a spell.
+
+sum [spell] Prints checksums.
+md5sum [spell] Prints md5sums.
+size spell Prints total size of all files installed
+ by this spell
+export Makes snapshot of box's configuration.
+import snapshot Restores snapshot.
+
+section [section] Lists all sections. Or all spells in
+ the specified section.
+maintainer [section] Lists who is the maintainer for a section
+grimoire [grimoire] Views a text listing of all grimoires.
+ Or of the specified grimoire.
+grimoires Views list of installed grimoires' names
+html [-s] [grimoire] Views a html listing of all grimoires.
+ Or of the specified grimoire.
+ Additionally displays links to the source
+ files when -s is given.
+
+newer 20020521 Shows available spells newer than May 21,
2002.
+older 20010521 Shows spells installed before May 21, 2001.
+newer last_sorcery_update Shows spells newer than your previous sorcery
+ update
+newer last_cast Shows spells newer than your last casting
+
+voyeur [delay or spell]
+ Peeks into spell compilation.
+
+orphans <empty> Displays installed spells that no installed
+ spells explicitly depend on.
+
+depends [--fast] spell [level]
Displays the spells that explicitly or
- recursively depend on this spell,
- up to \$level levels (infinity if omitted)
+ recursively depend on this spell,
+ up to \$level levels (infinity if omitted)
--fast omits some information but runs
faster

dependencies [-c ] [--no-optionals ] spell [level]
- Displays the spells this spell explicitly
- or recursively depends on, up to \$level
- levels (infinity if omitted). -c turns
- on compact mode, which will prevent
- previously shown trees from being displayed
- (avoids loops). --no-optionals skips
- optional spells
+ Displays the spells this spell explicitly
+ or recursively depends on, up to \$level
+ levels (infinity if omitted). -c turns
+ on compact mode, which will prevent
+ previously shown trees from being displayed
+ (avoids loops). --no-optionals skips
+ optional spells

-SCRIPT NAME spell will print the spell script for that spell.
+SCRIPT NAME spell will print the spell script for that spell.

-activity <empty> View the activity log
+activity <empty> View the activity log

-install-queue <empty> View the install queue
+install-queue <empty> View the install queue

-remove-queue <empty> View the remove queue
+remove-queue <empty> View the remove queue

-checkmd5s [spell|section] Print a md5 check of spells
+checkmd5s [spell|section] Print a md5 check of spells

-system-info Show information about a
Source Mage system
+system-info Show information about a Source Mage system

-show-held Shows all held spells.
+show-held Shows all held spells.

-show-exiled Shows all exiled spells.
+show-exiled Shows all exiled spells.

EOF
}
@@ -441,20 +442,20 @@ function gaze_catalog_html() {
BOLD="<td>"
UNBOLD="</td>"
fi
- if [ -z "$UPDATED" ] && [ "$ENTERED" ]; then
- UPDATED=$ENTERED
- fi
+ if [ -z "$UPDATED" ] && [ "$ENTERED" ]; then
+ UPDATED=$ENTERED
+ fi
echo "${BOLD}${SPELL}${UNBOLD}"
echo "${BOLD}${VERSION}${UNBOLD}"
echo "<td>$UPDATED</td>"

if [ "$WEB_SITE" != "unknown" ]; then
- WEBSITE="`echo $WEB_SITE | cut -c-30`..."
- echo "<td>"
- echo "<a href=\"$WEB_SITE\">$WEBSITE</a>"
- echo "</td>"
+ WEBSITE="`echo $WEB_SITE | cut -c-30`..."
+ echo "<td>"
+ echo "<a href=\"$WEB_SITE\">$WEBSITE</a>"
+ echo "</td>"
else
- echo "<td></td>"
+ echo "<td></td>"
fi
if [[ $COLS -eq 5 ]]; then
echo "<td>"
@@ -464,7 +465,7 @@ function gaze_catalog_html() {
while [ -n "${!ii}" ]; do
iii="${ii}_URL"
echo "<br />"
- echo "<a href=\"${!iii}\">$(echo ${!ii} | cut -c-25)</a>"
+ echo "<a href=\"${!iii}\">$(echo ${!ii} | cut -c-25)</a>"
i=$(($i+1))
ii=SOURCE${i}
done
@@ -496,8 +497,8 @@ function display() {
*text) cat $1 | $PAGER ;;
bzip2*) bzcat $1 | $PAGER ;;
gzip*) gzip -cd $1 | $PAGER ;;
- *) message "Unknown file type."
- return 1 ;;
+ *) message "Unknown file type."
+ return 1 ;;
esac
else
message "$2" 1>&2
@@ -721,7 +722,7 @@ function real_long_search() {
local SEARCH SEARCH_RESULTS

if ! [[ $GAZE_VERBOSE == 0 ]] ; then
- echo "Searching... "
+ echo "Searching... "
fi

let i=0
@@ -805,8 +806,8 @@ function specific_voyeur()
then
return 1
fi
- nice -n +20 \
- tail /tmp/$1.compile.log \
+ nice -n +20 \
+ tail /tmp/$1.compile.log \
--follow=name --pid=$(ls "/tmp/liblock-0/cast.$1") 2>/dev/null
}

@@ -821,7 +822,7 @@ function any_voyeur()
sed "s/.*\/cast\.//" | head -n 1`
[ $FILE ] || return 1
debug "voyeur" "Looking at spell \"$FILE\""
- nice -n +20 \
+ nice -n +20 \
tail $(find /tmp/sorcery/cast/ -name $FILE.compile.log )\
--follow=name --pid=$(ls "/tmp/liblock-0/cast.$FILE") 2>/dev/null
}
@@ -1014,14 +1015,14 @@ #---------------------------------------
function gaze_show_spell_version_table() {

(
- echo "Grimoire|Section|Spell|Grimoire Version|Installed Version"
+ echo "Grimoire|Section|Spell|Grimoire Version|Installed Version"
echo "--------|-------|-----|----------------|-----------------"

for SPELL in $@; do

codex_set_current_spell $SPELL &&
local INSTALLED=`installed_version $SPELL` &&
- echo
"$GRIMOIRE_NAME|$SECTION|$SPELL|${VERSION:="-"}|${INSTALLED:="-"}"
+ echo
"$GRIMOIRE_NAME|$SECTION|$SPELL|${VERSION:="-"}|${INSTALLED:="-"}"

done

@@ -1108,8 +1109,8 @@ function gaze_show_versions() {
then
codex_set_current_spell $SPELL_DIRECTORY

- if [ $ECHO_INSTALLED -eq 1 ]
- then
+ if [ $ECHO_INSTALLED -eq 1 ]
+ then
echo "$GRIMOIRE_NAME|$SECTION|$SPELL|$VERSION|${INSTALLED:="-"}"
ECHO_INSTALLED=0
else
@@ -1478,19 +1479,19 @@ ##
#-----
function gaze_show_dependencies() {
local FOUND SPELL NO_OPTIONALS
-
+
while true; do
# Check for the compact mode flag
if [[ $1 == -c ]] ; then
FOUND="/tmp/gaze.seen.$$"
- echo -n > $FOUND
- shift
+ echo -n > $FOUND
+ shift
continue
fi
# Check for the no optionals flag
if [[ $1 == --no-optionals ]] ; then
NO_OPTIONALS=yes
- shift
+ shift
continue
fi
break
@@ -1498,7 +1499,7 @@ function gaze_show_dependencies() {

SPELL=$1
codex_does_spell_exist "$SPELL" || exit 1
-
+
[[ $# == 2 ]] && MAX_DEPTH=$2

(
@@ -1531,56 +1532,56 @@ function gaze_show_dependencies() {

while (( COUNT-- )); do echo -en "$CHAR"; done
}
-
- # These functions shouldn't do anything in this function.
- # Eventualy, they should be separated into two lists, ones
- # that may be used in DEPENDS, and ones that shouldn't be
- define_functions ': ;' \
- real_persistent_save real_query_string
config_get_option \
- config_set_option real_config_query
real_config_query_option \
- real_config_query_string real_list_add
-
- # real_config_query_list should set $1 to something
reasonable:
- real_config_query_list() { eval "$1='$3'"; }
+
+# These functions shouldn't do anything in this function.
+# Eventualy, they should be separated into two lists, ones
+# that may be used in DEPENDS, and ones that shouldn't be
+ define_functions ': ;' \
+ real_persistent_save real_query_string config_get_option \
+ config_set_option real_config_query real_config_query_option \
+ real_config_query_string real_list_add
+
+# real_config_query_list should set $1 to something reasonable:
+ real_config_query_list() { eval "$1='$3'"; }

recurse () {
local name=$1 DEPTH=$2 WHAT=$3
- local found_before=""
-
- if ! [[ $name ]] ; then
- return ;
- fi
-
-
+ local found_before=""
+
+ if ! [[ $name ]] ; then
+ return ;
+ fi
+
+
[[ $MAX_DEPTH ]] && [[ $DEPTH -ge $MAX_DEPTH ]] && return 1
grep () {
local foo
smgl_which grep foo &&
$foo "$@"
}
- [[ $FOUND ]] &&
- grep -q '^'$name'$' $FOUND &&
- found_before=" (see above for tree)"
+ [[ $FOUND ]] &&
+ grep -q '^'$name'$' $FOUND &&
+ found_before=" (see above for tree)"

repeat "\t" $DEPTH
echo "$name ($WHAT)${found_before}"
- if [[ $found_before ]] ; then
- return ;
- elif [[ $FOUND ]] ; then
- echo "$name" >> $FOUND
- fi
+ if [[ $found_before ]] ; then
+ return ;
+ elif [[ $FOUND ]] ; then
+ echo "$name" >> $FOUND
+ fi

local SPELL=$(codex_find_spell_by_name $name)
[[ -e "$SPELL/DEPENDS" ]] &&
(
- let DEPTH++
- define_functions ':;' grep
- source "$SPELL/DEPENDS" 2>/dev/null
+ let DEPTH++
+ define_functions ':;' grep
+ source "$SPELL/DEPENDS" 2>/dev/null
)
}
recurse $SPELL
)
- [[ $FOUND ]] && rm $FOUND
+ [[ $FOUND ]] && rm $FOUND
}

#-----
@@ -1653,13 +1654,13 @@ #---------------------------------------

function figure_installed()
{
- local version
- version=$(installed_version $1)
- if [ -n "$version" ]; then
- message "[${version}]"
- else
- message "[not installed]"
- fi
+ local version
+ version=$(installed_version $1)
+ if [ -n "$version" ]; then
+ message "[${version}]"
+ else
+ message "[not installed]"
+ fi
}

#---------------------------------------------------------------------
diff --git a/usr/sbin/scribbler b/usr/sbin/scribbler
index 05d55f1..c3c55c5 100755
--- a/usr/sbin/scribbler
+++ b/usr/sbin/scribbler
@@ -27,12 +27,12 @@ Scribbler is a utility for controlling t
Example: scribbler add bash test stable
Usage:
scribbler add spell from-grimoire to-grimoire [to-section]
- copies a spell from one grimoire to
- another grimoire into the specified section.
- The to-section is the same as the source section if unspecified
-
+ copies a spell from one grimoire to
+ another grimoire into the specified section.
+ The to-section is the same as the source section if unspecified
+
scribbler remove spell from-grimoire
- removes a spell from a grimoire
+ removes a spell from a grimoire

EOF
}
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index ce15ea4..942a3f5 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -27,26 +27,26 @@ and the spells in your grimoires.
Invoke scribe with the desired command followed by the target.
Note that most options can be called with the beginning of the command.

-Command Arguments Description
-add grimoire [from source] Adds a new grimoire
- (optionally from a different URL)
-remove grimoire Removes a grimoire
-update [grimoire] Updates a grimoire or all grimoires
-
-fix grimoire Attempts to fix metadata for grimoire
-reindex [grimoire] Recreates the list of spells
-reindex-keyword [grimoire] Recreates keyword listing
+Command Arguments Description
+add grimoire [from source] Adds a new grimoire
+ (optionally from a different URL)
+remove grimoire Removes a grimoire
+update [grimoire] Updates a grimoire or all grimoires
+
+fix grimoire Attempts to fix metadata for grimoire
+reindex [grimoire] Recreates the list of spells
+reindex-keyword [grimoire] Recreates keyword listing
(official grimoires should come with
a keyword listing already)

-index Prints list of grimoires
+index Prints list of grimoires

-set grim1 grim2 puts grim1 before grim2
-swap grim1 grim2 Swaps two grimoires
+set grim1 grim2 puts grim1 before grim2
+swap grim1 grim2 Swaps two grimoires

-localize grimoire Makes a grimoire local
- (so scribe won't try to update it)
-unlocalize grimoire Makes a grimoire nonlocal
+localize grimoire Makes a grimoire local
+ (so scribe won't try to update it)
+unlocalize grimoire Makes a grimoire nonlocal


Grimoire tarballs are located at $CODEX_TARBALL_URL
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index ee72138..905a7e1 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -32,27 +32,27 @@ Usage: sorcery [parameters]

Optional Parameters:

--h | --help | help Display this help screen
+-h | --help | help Display this help screen

--s | system-update Perform a system update (updates sorcery, grimoire,
- and spells).
- [ scribe update, sorcery queue, cast --queue ]
--u | update Update the sorcery scripts only.
--g | upgrade Do not update grimoire, just any spells that need to
- be upgraded. [ sorcery queue, cast --queue ]
+-s | system-update Perform a system update (updates sorcery, grimoire,
+ and spells).
+ [ scribe update, sorcery queue, cast --queue ]
+-u | update Update the sorcery scripts only.
+-g | upgrade Do not update grimoire, just any spells that need to
+ be upgraded. [ sorcery queue, cast --queue ]

--r | rebuild rebuild all spells
+-r | rebuild rebuild all spells

--q | queue Compare installed grimoire to installed spells,
- generate queue of spells needing to be updated.
- queue-security Same as queue, but only for spells that need
- updating due to security fixes.
+-q | queue Compare installed grimoire to installed spells,
+ generate queue of spells needing to be updated.
+ queue-security Same as queue, but only for spells that need
+ updating due to security fixes.

-review-queue Review the install queue for each spell's history
- since each was last installed.
+review-queue Review the install queue for each spell's history
+ since each was last installed.

-add-queue <spell|s> Add spell(s) to install queue
-remove-queue <spell|s> Remove spell(s) from install queue
+add-queue <spell|s> Add spell(s) to install queue
+remove-queue <spell|s> Remove spell(s) from install queue

hold <spell|s> Sets spells' status to held.
unhold <spell|s> Sets spells' status to installed.
@@ -61,26 +61,26 @@ exile <spell|s> Sets spells' status
unexile <spell|s> Removes spells' exiled status (to not installed at all).


-default add spell_1 spell_2 on/off If "spell_1" optionally depends
- on "spell_2" the default answer
- is on/off.
+default add spell_1 spell_2 on/off If "spell_1" optionally depends
+ on "spell_2" the default answer
+ is on/off.

-default add "" spell on/off If anything optionally depends on "spell" the
- default answer is on/off.
+default add "" spell on/off If anything optionally depends on "spell" the
+ default answer is on/off.

-default add spell "" on/off If "spell" optionally depends on anything
- the default answer is on/off.
+default add spell "" on/off If "spell" optionally depends on anything
+ the default answer is on/off.

-default add spell PROVIDER on/off "Spell" is the provder for
- PROVIDER bydefault, in the
- case of optional_depends, if
- on/off is off, none is chosen
- by default instead.
+default add spell PROVIDER on/off "Spell" is the provder for
+ PROVIDER bydefault, in the
+ case of optional_depends, if
+ on/off is off, none is chosen
+ by default instead.

default remove [spell|""] [spell|PROVIDER|""] Remove entry from defaults
default search [spell|""] [spell|PROVIDER|""] [on|off] Search defaults

--v | --version Print the sorcery version
+-v | --version Print the sorcery version

EOF

@@ -136,8 +136,8 @@ mirror_menu() {
"KERNEL" "" "$L_HELP" \
"GNOME" "" "$N_HELP" \
"GNU" "" "$G_HELP" \
- "SOURCEFORGE" "" "$SF_HELP" \
- "SORCERY" "" "$S_HELP" \
+ "SOURCEFORGE" "" "$SF_HELP" \
+ "SORCERY" "" "$S_HELP" \
"XFREE86" "" "$X_HELP"'`
do

@@ -172,7 +172,7 @@ mirror_menu() {
}


-show_spells() { (
+show_spells() { (

local SECTION=`codex_find_section_by_name $1`
local SPELLS=`codex_get_spells_in_section $SECTION`
@@ -266,7 +266,7 @@ add_pkgs() { (
) }


-show_file() {
+show_file() {

if [ -f $1 ]; then

@@ -330,7 +330,7 @@ show_installed_spells() {
}


-remove_pkgs() {
+remove_pkgs() {

while

@@ -768,7 +768,7 @@ # used by sorcery configuration
--menu \
"$ARCH_HELP" \
0 0 0 \
- '$LIST `; then
+ '$LIST `; then

# remove spurious ""
NEW_ARCH=`echo "${NEW_ARCH}" | sed -e 's/^"//' -e 's/"$//'`
@@ -925,18 +925,18 @@ I off . . . . . - . - . . - . . . - .
local IGNORE_HELP="Ignore (do not check) integrity of downloads.
DANGEROUS!"

if INT_DL_CHECK=`eval $DIALOG ' --title "$INT_DL_TITLE" \
- --no-cancel \
- --ok-label "Commit" \
- --item-help \
- --menu \
- "$INT_DL_HELP" \
- 0 0 0 \
- "P" "Abort unpack paranoid" "$ABORT_ALL_HELP" \
- "A" "Abort unpack but ask on ignore" "$ABORT_HELP" \
- "B" "Ask (default abort)" "$ABORT_ASK_HELP" \
- "U" "Ask (default abort save ignore)" "$ABORT_IGN_HELP" \
- "G" "Ask (default ignore)" "$IGNORE_ASK_HELP" \
- "I" "Ignore (do not check)" "$IGNORE_HELP"'`
+ --no-cancel \
+ --ok-label "Commit" \
+ --item-help \
+ --menu \
+ "$INT_DL_HELP" \
+ 0 0 0 \
+ "P" "Abort unpack paranoid" "$ABORT_ALL_HELP" \
+ "A" "Abort unpack but ask on ignore" "$ABORT_HELP" \
+ "B" "Ask (default abort)" "$ABORT_ASK_HELP" \
+ "U" "Ask (default abort save ignore)" "$ABORT_IGN_HELP" \
+ "G" "Ask (default ignore)" "$IGNORE_ASK_HELP" \
+ "I" "Ignore (do not check)" "$IGNORE_HELP"'`
then
case $INT_DL_CHECK in
P) modify_local_config "MD5SUM_DL" "abort_all" ;;
@@ -1151,7 +1151,7 @@ integrity_menu() {

while INT_CHECKS=`eval $DIALOG ' --title "$INT_TITLE" \
--cancel-label "Exit" \
- --ok-label "Select" \
+ --ok-label "Select" \
--item-help \
--menu \
"$INT_HELP" \
diff --git a/usr/sbin/summon b/usr/sbin/summon
index 4be5a2f..fc09afd 100755
--- a/usr/sbin/summon
+++ b/usr/sbin/summon
@@ -33,22 +33,22 @@ Usage: summon [parameters] [sp

Optional Parameters:

---from <directory> Specify an alternate for $SOURCE_CACHE
-
+--from <directory> Specify an alternate for $SOURCE_CACHE

---url <URL> Specify an alternate download URL

--d | --download Force download of source, regardless
of
+--url <URL> Specify an alternate download URL
+
+-d | --download Force download of source, regardless of
of whether it exists locally or not.

--g | --grimoire <grimoire> Searches only the given grimoire when
+-g | --grimoire <grimoire> Searches only the given grimoire when
searching for spells to summon.
- <grimoire> can be absolute or relative to
- $CODEX_ROOT
- Note that spells or the --all parameter
- still needs to be specified.
+ <grimoire> can be absolute or relative to
+ $CODEX_ROOT
+ Note that spells or the --all parameter
+ still needs to be specified.

--p | --print <type> Instead of downloading, print out
+-p | --print <type> Instead of downloading, print out
information in some form according
to the value of <type> for each spell:
source - print out the filenames
@@ -63,9 +63,9 @@ Optional Parameters:
file2 url2-1 url2-2 ...
...

---queue Download all spells in the install
queue.
---all Download all spells in the grimoires.
- (note: this is several gigabytes)
+--queue Download all spells in the install queue.
+--all Download all spells in the grimoires.
+ (note: this is several gigabytes)
EOF

exit 1
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 61abc80..d966105 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -68,9 +68,9 @@ function run_config_loc () {
fi

if query "Do you wish to add -- options to ./configure?" n ; then
- F_TMP=$TMP_DIR/cast.$$.configure
+ F_TMP=$TMP_DIR/cast.$$.configure
rm -f $F_TMP
-
+
if [ -x ./configure ]; then
./configure --help > $F_TMP
elif [ -x ./src/configure ]; then
@@ -133,9 +133,9 @@ function real_prepare_install() { (
)
# TODO this is a dirty hack we need to remove it
for dir in $( find $SOURCE_DIRECTORY/old.binaries )
- do
- if [[ -d $dir ]]
- then
+ do
+ if [[ -d $dir ]]
+ then
export PATH="$dir:$PATH"
fi
done
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index dac27ea..93e9a39 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -214,7 +214,7 @@ ##
#---------------------------------------------------------------------
function config_query_option () {
debug "libapi" "config_query_option - $*"
- real_config_query_option "$@"
+ real_config_query_option "$@"
}

#---------------------------------------------------------------------
@@ -561,9 +561,9 @@ function guess_compressor () {

#------------------------------------------------------------------------
## @Type API
-## @param from File we might want to install
-## @param to File to replace
-## @param savetime Backup time if necessary
+## @param from File we might want to install
+## @param to File to replace
+## @param savetime Backup time if necessary
##
## @See <@function
var.lib.sorcery.modules.libresurrect.html,real_handle_changed_config> for
more details.
##
@@ -608,9 +608,9 @@ function installed_version () {

#------------------------------------------------------------------------
## @Type API
-## @param from File we might want to install
-## @param to File to replace
-## @param savetime Backup time if necessary (optional, defaults to
+## @param from File we might want to install
+## @param to File to replace
+## @param savetime Backup time if necessary (optional, defaults to
## $(date +'%Y%m%d%H%M')
## @See <@function
var.lib.sorcery.modules.libresurrect.html,real_install_config_file> for more
details.
## Returns the current version of the given spell
@@ -656,7 +656,7 @@ ##
#---------------------------------------------------------------------
function list_remove () {
debug "libapi" "list_remove - $*"
- real_list_remove "$@"
+ real_list_remove "$@"
}

#---------------------------------------------------------------------
@@ -855,7 +855,7 @@ ##
#---------------------------------------------------------------------
function persistent_load () {
debug "libapi" "persistent_load - $*"
- real_persistent_load "$@"
+ real_persistent_load "$@"
}

#---------------------------------------------------------------------
@@ -871,7 +871,7 @@ ##
#---------------------------------------------------------------------
function persistent_remove () {
debug "libapi" "persistent_remove - $*"
- real_persistent_remove "$@"
+ real_persistent_remove "$@"
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index aa47625..62657cf 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -163,7 +163,7 @@ function query_custom_cflags() {
CFLAGS) USER_SPELL_CFLAGS="$@" ;;
CXXFLAGS) USER_SPELL_CXXFLAGS="$@" ;;
LDFLAGS) USER_SPELL_LDFLAGS="$@" ;;
- CPPFLAGS) USER_SPELL_CPPFLAGS="$@" ;;
+ CPPFLAGS) USER_SPELL_CPPFLAGS="$@" ;;
esac
done
fi
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index fc83edd..29c2913 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -741,18 +741,18 @@ ## is asked for.
##
#---------------------------------------------------------------------
function codex_create_cache() {
-
- debug "libcodex" "codex_create_cache - $*"
- local list="$*"
- [[ $list ]] || list="${GRIMOIRE_DIR[*]}"
-
- for i in $list ; do
- codex_find_in_grimoire $i "DETAILS" | \
- sed 's@\(.*\)/\([^/]*\)/DETAILS@\2 \1@' | \
- sort > $i/$SPELL_INDEX_FILE
-
- codex_list_provides $i > "$i/$PROVIDE_INDEX_FILE"
- done
+
+ debug "libcodex" "codex_create_cache - $*"
+ local list="$*"
+ [[ $list ]] || list="${GRIMOIRE_DIR[*]}"
+
+ for i in $list ; do
+ codex_find_in_grimoire $i "DETAILS" | \
+ sed 's@\(.*\)/\([^/]*\)/DETAILS@\2 \1@' | \
+ sort > $i/$SPELL_INDEX_FILE
+
+ codex_list_provides $i > "$i/$PROVIDE_INDEX_FILE"
+ done

}

diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index a41d153..ec627a8 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1554,15 +1554,15 @@ ## Removes a dependency from the list.
#---------------------------------------------------------------------
function private_remove_dependees()
{
- local SPELL=$1
- local i
- echo "Removing dependees of $1"
-
- # spell is being removed from cast list, add to FAILED_LIST
- echo "$SPELL" >> $FAILED_LIST
- hash_put depends_looked_at $SPELL failed
- hash_unset "$CAST_HASH" "$SPELL"
- hash_put $CANNOT_CAST_HASH "$SPELL" "Failed"
+ local SPELL=$1
+ local i
+ echo "Removing dependees of $1"
+
+ # spell is being removed from cast list, add to FAILED_LIST
+ echo "$SPELL" >> $FAILED_LIST
+ hash_put depends_looked_at $SPELL failed
+ hash_unset "$CAST_HASH" "$SPELL"
+ hash_put $CANNOT_CAST_HASH "$SPELL" "Failed"
}

#---------------------------------------------------------------------
@@ -1577,7 +1577,7 @@ function run_spell_config()

if [ -x $SPELL_CONFIG ]; then
debug "libdepends" "run_spell_config() - found $SPELL_CONFIG"
- . $SPELL_CONFIG
+ . $SPELL_CONFIG
fi
}

diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index da09924..0c9dae4 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -364,7 +364,7 @@ function dispel_spell() {
}

#---------------------------------------------------------------------
-## @param default value
+## @param default value
## Set one of always, ask_yes, ask_no, and ignore to on based
## on the value of default, leave the remaining as off.
#---------------------------------------------------------------------
@@ -384,9 +384,9 @@ function dispel_depends_value_to_items()


#---------------------------------------------------------------------
-## @param Title of the menu
-## @param Name of the parameter being set
-## @param Default value of the parameter being set
+## @param Title of the menu
+## @param Name of the parameter being set
+## @param Default value of the parameter being set
##
## Present a radiolist menu with the quad-options for one of various
## dependency following options.
diff --git a/var/lib/sorcery/modules/libdownload
b/var/lib/sorcery/modules/libdownload
index 7c396c5..953ff06 100755
--- a/var/lib/sorcery/modules/libdownload
+++ b/var/lib/sorcery/modules/libdownload
@@ -59,7 +59,7 @@ ##
## Download a specified group of urls, they are assumed to all be understood
## by the specified handler.
##
-## @Param type Name of handler
+## @Param type Name of handler
## The remainder of the arguments are target, url_list, hints, dl_target
## and dl_type. See above for information.
##
diff --git a/var/lib/sorcery/modules/libhash b/var/lib/sorcery/modules/libhash
index 696191e..2b5c35e 100755
--- a/var/lib/sorcery/modules/libhash
+++ b/var/lib/sorcery/modules/libhash
@@ -246,7 +246,7 @@ function hash_get_table() {
VARIABLES=`eval 'echo ${!'${TABLE_NAME}'*}'`

for i in $VARIABLES; do
- echo -n "${!i}${separator}"
+ echo -n "${!i}${separator}"
done

}
diff --git a/var/lib/sorcery/modules/liblock b/var/lib/sorcery/modules/liblock
index 010da47..82ff964 100755
--- a/var/lib/sorcery/modules/liblock
+++ b/var/lib/sorcery/modules/liblock
@@ -111,12 +111,12 @@ # fi

while find $LOCK_DIR -mindepth 1 -maxdepth 1 -name "$1.*" | grep -q '';
do
- #^^^ look if a lock exists of the given type (ugly code)
+ #^^^ look if a lock exists of the given type (ugly code)
global_clean_resources
local SLEEP=$(( ${RANDOM} % ${MAX_SLEEP} ))
sleep "$SLEEP"
done
- #theoretically, someone could create a lock now... tiny race
+ #theoretically, someone could create a lock now... tiny race
trylock_resources "$@"
}

@@ -186,8 +186,8 @@ global_clean_resources()
# we remove locks that are owned by dead processes
find "${LOCK_DIR}" -maxdepth 2 -mindepth 2 | \

- while read file; do
- # check if the process still exist (we use procfs mounted
on /proc)
+ while read file; do
+ # check if the process still exist (we use procfs mounted on /proc)
if [ ! -d "${file}" ]; then
debug "global_clean_resources" "removing stale lock ${file}"
rm -f "${file}" 2>/dev/null &&
@@ -198,8 +198,8 @@ global_clean_resources()
}

#---------------------------------------------------------------------
-## @param Name of file to lock
-## @param <file> ... (optional)
+## @param Name of file to lock
+## @param <file> ... (optional)
##
## Locks files for access to only this PID. Will cause attempts by
## other processes that want to lock the file(s) to block until this
@@ -212,37 +212,37 @@ ##
#---------------------------------------------------------------------
function lock_file()
{
- debug "liblock" "$FUNCNAME - $*"
- local FILE
- lock_resources $(
- for FILE in "$@" ; do
- echo file $FILE
- done
- )
+ debug "liblock" "$FUNCNAME - $*"
+ local FILE
+ lock_resources $(
+ for FILE in "$@" ; do
+ echo file $FILE
+ done
+ )
}


#---------------------------------------------------------------------
-## @param Name of file to unlock
-## @param <file> ... (optional)
+## @param Name of file to unlock
+## @param <file> ... (optional)
##
## Unlocks a file so that another process can lock and modify it.
##
#---------------------------------------------------------------------
function unlock_file()
{
- debug "liblock" "$FUNCNAME - $*"
- local FILE
- unlock_resources $(
- for FILE in "$@" ; do
- echo file $FILE
- done
- )
+ debug "liblock" "$FUNCNAME - $*"
+ local FILE
+ unlock_resources $(
+ for FILE in "$@" ; do
+ echo file $FILE
+ done
+ )
}

#---------------------------------------------------------------------
-## @param File to start transaction on
-## @param <file> ... (optional)
+## @param File to start transaction on
+## @param <file> ... (optional)
##
## A transaction locks a file and ensures that changes made to the
## file are all made at once. No changes are made to the file until
@@ -252,7 +252,7 @@ ## making any changes to the files. All
## If not all can be locked, they will be unlocked, and another try
## will be made.
##
-## @return The name of a temporary file that should be written to
+## @return The name of a temporary file that should be written to
## instead of the real file.
##
#---------------------------------------------------------------------
@@ -292,8 +292,8 @@ function lock_start_transaction()
}

#---------------------------------------------------------------------
-## @param File to commit transaction of
-## @param <file> ... (optional)
+## @param File to commit transaction of
+## @param <file> ... (optional)
##
## Commits the changes made to the files as atomicaly as possible
## Before this func is called, the files remain unchanged.
@@ -337,8 +337,8 @@ function lock_commit_transaction()
}

#---------------------------------------------------------------------
-## @param File to stop the transaction of
-## @param file ... (optional)
+## @param File to stop the transaction of
+## @param file ... (optional)
##
## Stops a transaction. Causes the changes to the file(s) to be
## ignored/undone.
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index b11e519..37c7064 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -68,8 +68,8 @@ ## Argument is a string to check if the
## not
#--------------------------------------------------------------------
function isdigit() {
- echo $1 | grep '[[:digit:]]+' >> /dev/null 2>&1 &&
- return 0
+ echo $1 | grep '[[:digit:]]+' >> /dev/null 2>&1 &&
+ return 0
}

#--------------------------------------------------------------------
@@ -79,8 +79,8 @@ ##
## Argumtemt is a string to check if it contains all chars a-zA-Z
#--------------------------------------------------------------------
function isalpha() {
- echo $1 | grep '[[:alpha:]]+' >> /dev/null 2>&1 &&
- return 0
+ echo $1 | grep '[[:alpha:]]+' >> /dev/null 2>&1 &&
+ return 0
}

#---------------------------------------------------------------------
@@ -329,9 +329,9 @@ function sound() {
on) SOUND_FILE=$SOUND_DIRECTORY/$SOUND_THEME/$1
if [ -e $SOUND_FILE ]; then
( cd / ; play $SOUND_FILE 2>/dev/null & )
- debug "libmisc" "Playing $SOUND_FILE"
- else
- debug "libmisc" "Error playing $SOUND_FILE: no such file"
+ debug "libmisc" "Playing $SOUND_FILE"
+ else
+ debug "libmisc" "Error playing $SOUND_FILE: no such file"
fi
;;
esac
@@ -1156,10 +1156,10 @@ function smgl_which() {
BREAK=yes
fi
}
- if [ -z "$1" -o -z "$2" ]; then
- echo "smgl_which: Not enough arguments"
- return 1
- fi
+ if [ -z "$1" -o -z "$2" ]; then
+ echo "smgl_which: Not enough arguments"
+ return 1
+ fi
location=$(iterate smgl_which_sub : "$PATH")
if [[ "$location" ]] ; then
eval "$2=$location"
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 7e9cd34..b74a6d1 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -401,9 +401,9 @@ function resurrect_sub() {


#------------------------------------------------------------------------
-## @param from File we might want to install
-## @param to File to replace
-## @param savetime Backup time if necessary (optional, defaults to
+## @param from File we might want to install
+## @param to File to replace
+## @param savetime Backup time if necessary (optional, defaults to
## $(date +'%Y%m%d%H%M')
#------------------------------------------------------------------------
function real_install_config_file() {
@@ -430,10 +430,10 @@ function real_install_config_file() {
}

#------------------------------------------------------------------------
-## @param from File we might want to install
-## @param to File to replace
-## @param savetime Backup time if necessary
-## @param md5_log MD5 log for previous version of the spell,
+## @param from File we might want to install
+## @param to File to replace
+## @param savetime Backup time if necessary
+## @param md5_log MD5 log for previous version of the spell,
# must be in root form
#------------------------------------------------------------------------
function internal_install_config_file() {
@@ -490,9 +490,9 @@ function internal_install_config_file()
}

#------------------------------------------------------------------------
-## @param from File we might want to install
-## @param to File to replace
-## @param savetime Backup time if necessary
+## @param from File we might want to install
+## @param to File to replace
+## @param savetime Backup time if necessary
##
## Present the user with the following menu
## (0) trash $to and install over it
diff --git a/var/lib/sorcery/modules/libscreen
b/var/lib/sorcery/modules/libscreen
index 401a6cc..db635e5 100755
--- a/var/lib/sorcery/modules/libscreen
+++ b/var/lib/sorcery/modules/libscreen
@@ -4,9 +4,9 @@ #-----
## Output a short message about using libscreen
#-----
function screen_quick_intro() {
- message "${MESSAGE_COLOR}Using screen mode. Watch the bottom for
notices."
- message "${MESSAGE_COLOR}Press ^A-n and ^A-p to cycle through
windows."
- message "${MESSAGE_COLOR}Screen help is available with ^A-?
(control-a ?)${DEFAULT}"
+ message "${MESSAGE_COLOR}Using screen mode. Watch the bottom for notices."
+ message "${MESSAGE_COLOR}Press ^A-n and ^A-p to cycle through windows."
+ message "${MESSAGE_COLOR}Screen help is available with ^A-? (control-a
?)${DEFAULT}"
}

#-----
diff --git a/var/lib/sorcery/modules/libsecurity
b/var/lib/sorcery/modules/libsecurity
index 285155a..9325ea5 100755
--- a/var/lib/sorcery/modules/libsecurity
+++ b/var/lib/sorcery/modules/libsecurity
@@ -217,7 +217,7 @@ function gaze_checkmd5syntax () {
fi
fi
echo -en "${DEFAULT_COLOR}"
-
+
}

#---------------------------------------------------------------------
@@ -278,7 +278,7 @@ #---------------------------------------
function gaze_md5check() {

message "${MESSAGE_COLOR}Going to check the md5 sums for the requested
item, section or"
- message "grimoire by testing your current collection of
sources...${DEFAULT_COLOR}"
+ message "grimoire by testing your current collection of
sources...${DEFAULT_COLOR}"

source /etc/sorcery/config

diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 902ee4f..a2020cf 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -326,10 +326,10 @@ function save_binaries() {
then
if [ -h $LINE ]; then
DEST=$( readlink "$LINE" )
- mkdir -p $( dirname $OLD_BINS/$LINE )
+ mkdir -p $( dirname $OLD_BINS/$LINE )
ln -sf $DEST $OLD_BINS/$LINE
else
- mkdir -p $( dirname $OLD_BINS/$LINE )
+ mkdir -p $( dirname $OLD_BINS/$LINE )
cp $LINE $OLD_BINS/$LINE
fi
echo $OLD_BINS/$LINE >> $SAVED
@@ -341,9 +341,9 @@ function save_binaries() {
unlock_file $SAVED

for dir in $( find $OLD_BINS )
- do
- if [[ -d $dir ]]
- then
+ do
+ if [[ -d $dir ]]
+ then
export PATH=$( envar_prepend_path "$dir" "$PATH" )
fi
done
@@ -450,7 +450,7 @@ #---------------------------------------
function files() {

while read ITEM; do
-
+
if [ -f "$ITEM" ] &&
! [ -h "$ITEM" ]; then
echo "$ITEM"
@@ -868,9 +868,9 @@ function update_install_queue() {

message "${CHECK_COLOR}Generating list of spells to update...
${DEFAULT_COLOR} "
count=0
- size=$(all_spell_status | wc -l)
+ size=$(all_spell_status | wc -l)
for line in `all_spell_status`; do
- progress_bar $count $size 50
+ progress_bar $count $size 50
#0=spell, 1=date, 2=status, 3=version
explode "$line" ":" "info"
spell=${info[0]}
@@ -886,7 +886,7 @@ function update_install_queue() {
"$curr_updated" "$tmp_queue"
fi
)
- let count++
+ let count++
done
clear_line
lock_file $INSTALL_QUEUE
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 8fdd6b3..9f78ff8 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -105,7 +105,7 @@ function stage_install_file()
;;
*)
cp -fdp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
- ;;
+ ;;
esac
}

@@ -157,10 +157,10 @@ function stage_install_char_block()
{
local FILE=$1
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/$FILE")
- local MAJOR=$(stat -c %t "${STAGE_DIRECTORY}/TRANSL/$FILE")
- local MINOR=$(stat -c %T "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local MAJOR=$(stat -c %t "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local MINOR=$(stat -c %T "${STAGE_DIRECTORY}/TRANSL/$FILE")
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
- local TYPE=$3
+ local TYPE=$3
message "${FILE_COLOR}${PERMISSION} $TYPE $MAJOR $MINOR
$FILE${DEFAULT_COLOR}"
case $2 in
config)
@@ -202,15 +202,15 @@ function stage_install_list()
if [[ -h $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_symlink "$@"
- elif [[ -b $STAGE_DIRECTORY/TRANSL/$1 ]]
- then
- stage_install_char_block "$@" b
- elif [[ -c $STAGE_DIRECTORY/TRANSL/$1 ]]
- then
- stage_install_char_block "$@" c
- elif [[ -p $STAGE_DIRECTORY/TRANSL/$1 ]]
- then
- stage_install_fifo "$@"
+ elif [[ -b $STAGE_DIRECTORY/TRANSL/$1 ]]
+ then
+ stage_install_char_block "$@" b
+ elif [[ -c $STAGE_DIRECTORY/TRANSL/$1 ]]
+ then
+ stage_install_char_block "$@" c
+ elif [[ -p $STAGE_DIRECTORY/TRANSL/$1 ]]
+ then
+ stage_install_fifo "$@"
elif [[ ! -d $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_file "$@"
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 7f5236e..1caa2b5 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -51,7 +51,7 @@ ## "tablet chapter" A spell's director
## $TABLET_PATH/$SPELL/...
## "tablet page" A specific instance of a spell in a chapter eg:
## $TABLET_PATH/$SPELL/<timestamp>/...
-## this is sometimes called a tablet dir, but I'm trying to phase that
out
+## this is sometimes called a tablet dir, but I'm trying to phase that out
##
## Accessors Routines (thus far):
## tablet_get_spell_file
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index c42ccf3..e99c429 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -142,7 +142,7 @@ function parse_iw() {
# it is EXTREMELY IMPORTANT that this variable contains an actual
# tab character and not some number of spaces. Otherwise BAD THINGS
# will happen.
- local TAB=" "
+ local TAB=$'\t'
OMIT_IN="${TAB}rename\|${TAB}symlink\|${TAB}unlink"

grep -v "$OMIT_IN" $INPUT | cut -f3 | grep "^/" | sed 's#^//#/#g'
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index 8225df5..4202ee7 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -226,7 +226,7 @@ function unpack_core() {
case "$2" in
bzip2|gzip|compress*|tar)
tar --no-same-owner --no-same-permissions -xf \
- /dev/stdin 2> /dev/null || cat > /dev/null ;;
+ /dev/stdin 2> /dev/null || cat > /dev/null ;;
Zip) cat /dev/stdin >/dev/null #get rid of unused output
unzip -q "$1" ;;
RPM) cpio -idm < /dev/stdin ;;
diff --git a/var/lib/sorcery/modules/liburl b/var/lib/sorcery/modules/liburl
index 36c4979..bda5293 100755
--- a/var/lib/sorcery/modules/liburl
+++ b/var/lib/sorcery/modules/liburl
@@ -141,15 +141,15 @@ function url_download_expand_sort() {
}

#---------------------------------------------------------------------
-## @param target Expected target file or tree, this is only a
+## @param target Expected target file or tree, this is only a
## suggestion, and the download handler may ignore it.
-## @param url_list List of urls to get the target from
-## @param hints Hints, these help the function determine what
-## type of thing it is downloading or other tunables.
-## @param udl_target Name of variable in which to store the name of the
-## result directory or file
-## @param udl_type Name of the variable in which to store the type of
-## thing downloaded
+## @param url_list List of urls to get the target from
+## @param hints Hints, these help the function determine what
+## type of thing it is downloading or other tunables.
+## @param udl_target Name of variable in which to store the name of the
+## result directory or file
+## @param udl_type Name of the variable in which to store the type of
+## thing downloaded
##
## @return 0 if file could be downloaded
## @return 1 otherwise



  • [SM-Commit] GIT changes to master sorcery by David Brown (3701246c74ef91803b836feb8238b67d1cd44dd1), David Brown, 07/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page