sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (439131106e5cf96e470162cf03a32f75c4bfe244)

From: Jaka Kranjc <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (439131106e5cf96e470162cf03a32f75c4bfe244)
Date: Thu, 31 Jan 2008 11:04:48 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

usr/sbin/alter | 64 ++++++------
usr/sbin/cabal | 18 +--
usr/sbin/cleanse | 108
++++++++++----------
usr/sbin/delve | 2
usr/sbin/gaze | 110
++++++++++-----------
usr/sbin/invoke | 56 +++++-----
usr/sbin/scribe | 16 +--
usr/sbin/sorcery | 10 -
usr/sbin/summon | 8 -
var/lib/sorcery/build/run_compiler | 2
var/lib/sorcery/modules/build_api/api1 | 10 -
var/lib/sorcery/modules/build_api/api2 | 24 ++--
var/lib/sorcery/modules/dl_handlers/dl_cvs | 8 -
var/lib/sorcery/modules/dl_handlers/dl_dir | 16 +--
var/lib/sorcery/modules/dl_handlers/dl_file | 6 -
var/lib/sorcery/modules/dl_handlers/dl_git | 6 -
var/lib/sorcery/modules/dl_handlers/dl_rsync | 14 +-
var/lib/sorcery/modules/dl_handlers/dl_svn | 4
var/lib/sorcery/modules/dl_handlers/dl_tla | 12 +-
var/lib/sorcery/modules/url_handlers/url_cvs | 24 ++--
var/lib/sorcery/modules/url_handlers/url_default | 14 +-
var/lib/sorcery/modules/url_handlers/url_dir | 16 +--
var/lib/sorcery/modules/url_handlers/url_file | 6 -
var/lib/sorcery/modules/url_handlers/url_git | 10 -
var/lib/sorcery/modules/url_handlers/url_git_http | 12 +-
var/lib/sorcery/modules/url_handlers/url_rsync | 4
var/lib/sorcery/modules/url_handlers/url_smgl_tla | 18 +--
var/lib/sorcery/modules/url_handlers/url_svn | 10 -
var/lib/sorcery/modules/url_handlers/url_svn_http | 10 -
var/lib/sorcery/modules/url_handlers/url_svn_https | 10 -
var/lib/sorcery/modules/url_handlers/url_svn_ssh | 12 +-
31 files changed, 320 insertions(+), 320 deletions(-)

New commits:
commit 439131106e5cf96e470162cf03a32f75c4bfe244
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

removed EOL whitespace in the rest of the usr tree
diff -b advised :)

diff --git a/usr/sbin/alter b/usr/sbin/alter
index 73912f6..7ddb739 100755
--- a/usr/sbin/alter
+++ b/usr/sbin/alter
@@ -10,14 +10,14 @@
function alter_alter() {

if [ -z "$1" ]; then
- cat <<EOF > /dev/stderr && return 1
+ cat <<EOF > /dev/stderr && return 1
alter [ -a|--alter ] [ -n|--spell spellname ]
[ -v|--version version ]
command [ args ... ]
EOF
fi

-
+
if [ "$1" == "-n" -o "$1" == "--spell" ]; then SPELL="$2";shift;shift; fi
if [ "$1" == "-v" -o "$1" == "--version" ]; then VERSION="$2";shift;shift;
fi

@@ -78,7 +78,7 @@ EOF
function alter_md5_mend() {

SINGLE= #grab a single conflict only instead of all conflicts
- STORE_BASE=${STORE_BASE:=/var/log/sorcery/tmp} # */tmp are often small
+ STORE_BASE=${STORE_BASE:=/var/log/sorcery/tmp} # */tmp are often small
# by default for the backup
SPELL="$1"
VERSION="$(gaze -q installed "$SPELL")"
@@ -118,7 +118,7 @@ function alter_md5_mend() {
SPELLS="$(echo "$RESULTS" | cut -d' ' -f1 | sort | uniq)"
TOTSP="$(echo "$SPELLS" | wc -l)"
FILES="$(echo "$RESULTS" | cut -d' ' -f2 | sort | uniq)"
- if [ "$ARCHIVE" != "off" ]; then
+ if [ "$ARCHIVE" != "off" ]; then
STORE=$STORE_BASE/$SPELL-$VERSION.$$
mkdir -p "$STORE"
mkdir -p "$STORE/tmp/sorcery"
@@ -134,23 +134,23 @@ function alter_md5_mend() {
echo "$SPFLS" |
sed -e 's/[^a-zA-Z0-9*.+]/\\&/g' |
sed -e 's/.*/\\:&: d/' |
- sed -i -f - "$MD5SUM_LOGS/$SPVER"
+ sed -i -f - "$MD5SUM_LOGS/$SPVER"
if [ "$ARCHIVE" != "off" ]; then
if [ "$COMPRESSBIN" == "tar" ]; then
- echo "$SPFLS" |
+ echo "$SPFLS" |
tar -f $INSTALL_CACHE/$SPVER-*.tar \
-kx -T /dev/stdin -C "$STORE" 2> /dev/null
else
- echo "$SPFLS" |
+ echo "$SPFLS" |
tar --"$COMPRESSBIN" -f $INSTALL_CACHE/$SPVER-*.tar$EXTENSION \
-kx -T /dev/stdin -C "$STORE" 2> /dev/null
fi
fi
progress_bar $((++COUNT)) $TOTSP 60 > /dev/stderr
done
- clear_line > /dev/stderr
+ clear_line > /dev/stderr
)
- if [ "$ARCHIVE" != "off" ]; then
+ if [ "$ARCHIVE" != "off" ]; then
message "${MESSAGE_COLOR}Creating
${SPELL_COLOR}$SPELL-undo${DEFAULT_COLOR}${MESSAGE_COLOR} spell for
${SPELL_COLOR}$SPELL-$VERSION${DEFAULT_COLOR}${MESSAGE_COLOR}.${DEFAULT_COLOR}"
> /dev/stderr
ORIGSPELL="$SPELL"
SPELL="$SPELL-undo"
@@ -164,8 +164,8 @@ function alter_md5_mend() {
create_md5list "$INST_LOG" "$MD5S_LOG" # relative to STORE instead of
absolute
CACHE="$INSTALL_CACHE/$SPELL-$VERSION-$HOST.tar"
CACHE_COMP="${CACHE}${EXTENSION}"
- # No install log nor compile cache needed or wanted since we are
- # only doing md5sum deletions from other spells, the undeleted
+ # No install log nor compile cache needed or wanted since we are
+ # only doing md5sum deletions from other spells, the undeleted
# form should only restore the md5sums to the proper location.
create_cache_archive $INST_LOG $CACHE $CACHE_COMP
rm -rf "$STORE"
@@ -238,7 +238,7 @@ function alter_pre_link() {

alter_alter -n smgl-prelink '
/usr/sbin/prelink -v '"$ARGS"' | tee $TMP_DIR/prelink.$$.output
- grep "Prelinking\\|Linking" $TMP_DIR/prelink.$$.output |cut -d" " -f2 |
+ grep "Prelinking\\|Linking" $TMP_DIR/prelink.$$.output |cut -d" " -f2 |
sort | uniq |
while read PRELINKED; do
touch "$PRELINKED"
@@ -284,8 +284,8 @@ function alter_strip_all_do() {
if [ "$(md5sum < $TMP_DIR/tostrip.$$)" == "$(md5sum < "$STRIPFILE")"
]; then
echo "$STRIPFILE" already stripped, skipping.
rm $TMP_DIR/tostrip.$$
- else
- if [ "$(ldd $TMP_DIR/tostrip.$$ | md5sum)" == "$(ldd "$STRIPFILE"
| md5sum)" ]; then
+ else
+ if [ "$(ldd $TMP_DIR/tostrip.$$ | md5sum)" == "$(ldd "$STRIPFILE"
| md5sum)" ]; then
echo "$STRIPFILE stripped and verified."
# uncomment the following to make backups before mving stripped
bins
# mkdir -p "/var/log/sorcery/tmp/smgl-strip.$$/${STRIPFILE%/*}"
@@ -326,8 +326,8 @@ function alter_strip_do() {
if [ "$(md5sum < $TMP_DIR/tostrip.$$)" == "$(md5sum < "$STRIPFILE")"
]; then
echo "$STRIPFILE" already stripped, skipping.
rm $TMP_DIR/tostrip.$$
- else
- if [ "$(ldd $TMP_DIR/tostrip.$$ | md5sum)" == "$(ldd "$STRIPFILE"
| md5sum)" ]; then
+ else
+ if [ "$(ldd $TMP_DIR/tostrip.$$ | md5sum)" == "$(ldd "$STRIPFILE"
| md5sum)" ]; then
echo "$STRIPFILE stripped and verified."
# uncomment the following to make backups before mving stripped
bins
# mkdir -p "/var/log/sorcery/tmp/smgl-strip.$$/${STRIPFILE%/*}"
@@ -377,7 +377,7 @@ Run alter without arguments to see a basic syntax guide.

Alter has two main uses:

-"alter":
+"alter":
This is the basic use of alter. Any command run on its command line
will be run as if it was run at the end of the cast, inside the cast of
the spell that is being altered. By default, it operates on the spell
@@ -386,7 +386,7 @@ for adding files to spells. See md5mend to modify files
in spells by
replacing them with in an alter session. When used together, with alter
run first, then md5mend run second, you should end up with a rather
clean system. Running alter to touch a file, then md5mending, then
-dispelling the alter spell will remove a file from the sytem cleanly.
+dispelling the alter spell will remove a file from the sytem cleanly.
In all, any modification of an installed spell couild be done while
maintaining somewhat logical md5sum logs.

@@ -411,17 +411,17 @@ Alter has three shortcut uses:

"prelink", "strip-all", or "strip":
These are two commonly used alter shortcuts. Prelinking optimizes
-the link space among all the binaries on the system. Strip-all strips
-all the binaries on the system one by one, and confirms that they are
+the link space among all the binaries on the system. Strip-all strips
+all the binaries on the system one by one, and confirms that they are
sane before installing them.
The first time you run either prelink or strip, alter creates the
/etc/prelink.conf file if you don't already have one. This part can
take up to an hour depending on processor speed and how full your disks
are, or as little as five minutes. The content of the file is merely a
listing, one directory per line, of all the directories that contain
-binaries that should be touched by prelink or this version of strip.
-Feel free to ctrl-c this process and make it yourself if you are
-impatient. The script, however, is very thorough and accurate, so it's
+binaries that should be touched by prelink or this version of strip.
+Feel free to ctrl-c this process and make it yourself if you are
+impatient. The script, however, is very thorough and accurate, so it's
not a bad idea to simply let the script run its course.
Both prelink and strip take quite a while to run everything through
because the md5mend process will essentially have to touch every archive
@@ -429,20 +429,20 @@ and md5sum file on your system. Be sure you have
plenty of space
available for the caches (if you have ARCHIVE=on). 1.5 times the
installed uncompressed binary size (averages about 1-2 gigs on most
installs, less for servers, more for desktops).
- If you want to both strip and prelink, strip before you prelink
+ If you want to both strip and prelink, strip before you prelink
seems to work better.
If you run prelink and get lots of -fPIC warnings, try upgrading
some of the spells, if it doesn't work, file a bug and CC
seth AT tautology.org on it and he will add -fPIC to the CFLAGS of the spell
-(alternatively, do this yourself and append an attachment to the bug).
-zlib needs -DPIC -fPIC. Prelinking doesn't like non-PIC'd binaries. It
+(alternatively, do this yourself and append an attachment to the bug).
+zlib needs -DPIC -fPIC. Prelinking doesn't like non-PIC'd binaries. It
won't hurt anything, it will just ignore them.
In my experience (Seth), stripping decreases file size, but doesn't
increase the speed, and prelink makes the files slightly bigger
(negligible), but decreases load time, often dramatically for C++ apps
with many links (read: KDE).

- For further study, RTFS or drop into the freenode #sourcemage
+ For further study, RTFS or drop into the freenode #sourcemage
channel and ask swoolley or the room for some urls or questions.

FAQ:
@@ -452,7 +452,7 @@ FAQ:

Q: How do I strip debugging info from my whole system?
A: alter -z
-
+
Q: I recompiled some libraries, and it slowed down.
A: Recompiling makes prelinking pointless, rerun alter -p upon each
update.

@@ -468,13 +468,13 @@ FAQ:
Q: How do I undo an alter?
A: There's no exact undo, but it's good enough if you've been using
only spells and alter:
-
+
# you did this but regretted it
alter -n alter-to-remove -v 31337 touch /bin/file # an alter
alter -m alter-to-remove # md5mend it

# undo the above
- dispel alter-to-remove # do this step only if the
files
+ dispel alter-to-remove # do this step only if the files
# it touched aren't critical.
If
# they are, set REAP=no before.
dispel -d alter-to-remove-undo 31337 # to unpack the undo cache
@@ -504,7 +504,7 @@ EOF
function main() {

[ -z "$1" ] && cat <<EOF > /dev/stderr && exit 1
-alter: usage:
+alter: usage:
alter [ { -a | --alter } ] # -a/--alter are ignored as this is default
[ { -n | --spell } spell:=alter ]
[ { -v | --version } version:=<installed> ] command [ args ... ]
@@ -559,7 +559,7 @@ elif [[ "$1" == -h ]] ||
[[ "$1" == --help ]] ||
[[ -z "$1" ]]; then
main "$1"
-else
+else
echo "Enter the root password, please." 1>&2
PARAMS=$(consolidate_params "$@")
su -c "$0 $PARAMS" root
diff --git a/usr/sbin/cabal b/usr/sbin/cabal
index 9718b8f..0b42fd3 100755
--- a/usr/sbin/cabal
+++ b/usr/sbin/cabal
@@ -18,7 +18,7 @@ function read_cabal_names() {
mkdir -p $CABAL_DIRECTORY

[ -f $CABAL_NAMES ] || return
-
+

eval `awk '{ print "CABALS[" NR-1 "]=\"" $0 "\""; }' "$CABAL_NAMES"`

@@ -45,7 +45,7 @@ function write_cabal_names() {
#---------------------
function print_cabal_names() {

-eval ${DIALOG} '--textbox ${CABAL_NAMES} 0 0'
+eval ${DIALOG} '--textbox ${CABAL_NAMES} 0 0'

#for (( COUNT = 0; COUNT != MAX_CABALS; COUNT++ )); do
# echo "${CABALS[$COUNT]}"
@@ -272,7 +272,7 @@ function cabal_key_menu() {

while

- HELP="Generate, distribute, and revoke ssh2 keys to cabal computers to
+ HELP="Generate, distribute, and revoke ssh2 keys to cabal computers to
enable root login without password prompts"
G_HELP="Create 2048 bit ssh2 dsa public/private keys for a cabal."
D_HELP="Install the public key on all computer members of cabal."
@@ -396,7 +396,7 @@ function cabal_copy() {

case $ORDER in
C) cat $CABAL_DIRECTORY/$CABAL |
- while read BOX; do
+ while read BOX; do
scp -i $CABAL_KEYS/$CABAL \
-r $SOURCE \
root@${BOX}:$DESTINATION \
@@ -404,7 +404,7 @@ function cabal_copy() {
done
;;
S) cat $CABAL_DIRECTORY/$CABAL |
- while read BOX; do
+ while read BOX; do
scp -i $CABAL_KEYS/$CABAL \
-r $SOURCE \
root@${BOX}:$DESTINATION
@@ -431,7 +431,7 @@ function cabal_execute() {

case $ORDER in
C) cat $CABAL_DIRECTORY/$CABAL |
- while read BOX; do
+ while read BOX; do
echo "execing box $BOX" && ssh -n -i $CABAL_KEYS/$CABAL \
root@${BOX} \
"$COMMAND" \
@@ -440,7 +440,7 @@ function cabal_execute() {
;;

S) cat $CABAL_DIRECTORY/$CABAL |
- while read BOX; do
+ while read BOX; do
echo "execing box $BOX" && ssh -n -i $CABAL_KEYS/$CABAL \
root@${BOX} \
"$COMMAND"
@@ -474,7 +474,7 @@ function cabal_enchantment_menu() {
HELP=""
C_HELP="Copy files and directories to cabals via scp"
E_HELP="Execute commands on cabals"
- S_HELP="Show the output of previously execute concurrent commands and
+ S_HELP="Show the output of previously execute concurrent commands and
copies"
TITLE="Enchantment Menu"

@@ -558,7 +558,7 @@ function show_file() {
if [ -n "${PAGER}" ]
then
PAGER=`which less`
-fi
+fi

DIALOG="${DIALOGPROG} --stdout"

diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index cf151fb..80429cc 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -2,7 +2,7 @@

#---------------------------------------------------------------------
## This script should clean up the sorcery files, particularly
-## the depends and packages files. It should validate the files
+## the depends and packages files. It should validate the files
## remove corrupted lines, and ensure the information all agrees
## with itself. It is also to clean out unused lines and files.
##
@@ -37,7 +37,7 @@ function usage()
{
local s=$(basename $0)
cat << EOF
-Invoke $s with one of the arguments below.
+Invoke $s with one of the arguments below.

Command Description
--delint Finds stale dependency entries
@@ -102,10 +102,10 @@ function args()
while [ $# -gt 0 ] ; do
arg=$1
shift
-
+
case $arg in
--help) usage ;;
- --delint)
+ --delint)
if [[ $1 == full ]] ; then
delint full
let rc+=$?
@@ -184,9 +184,9 @@ function delint()
if [[ $1 == full ]] ; then
cond=''
fi
-
+
lock_file $DEPENDS_STATUS
-
+
message "Pass one (malformed depends lines)"
# This grep will pull out malformed lines from the depends file
regex='^[^:]*:[^:]*:(on|off):(optional|required|suggest|runtime):'
@@ -195,7 +195,7 @@ function delint()
message "The following malformed lines were found"
message "and will cause problems with the following passes:"
message "$lines"
- if query "Do you want them removed" "n" ; then
+ if query "Do you want them removed" "n" ; then
message "Removing lines..."
grep -E "$regex" $DEPENDS_STATUS > $TMP_DIR/delint.1
mv $TMP_DIR/delint.1 $DEPENDS_STATUS
@@ -208,15 +208,15 @@ function delint()
return 1
fi
fi
-
+
generic_remove_stale "$DEPENDS_STATUS" depends two

message "Pass three (duplicate depends entries)"
for LINE in $( sed -n 's/^$[^:]*$:$[^:]*$:.*$/\1:\2/p' $DEPENDS_STATUS
| sed 's/+/\\+/' | sort | uniq -d ) ; do
message
options=()
- eval $(awk '/^'$LINE':/{
- if(!ENTRIES[$0]) {
+ eval $(awk '/^'$LINE':/{
+ if(!ENTRIES[$0]) {
printf("options[%d]=\"%s\"\n", count++, $0); ENTRIES[$0]=1;
} }' $DEPENDS_STATUS)
if [ ${#options[@]} -gt 1 ] ; then
@@ -235,7 +235,7 @@ function delint()

touch $SUB_DEPENDS_STATUS
lock_file $SUB_DEPENDS_STATUS
- generic_remove_duplicate "$SUB_DEPENDS_STATUS" sub_depends four
+ generic_remove_duplicate "$SUB_DEPENDS_STATUS" sub_depends four
generic_remove_stale "$SUB_DEPENDS_STATUS" sub_depends five
unlock_file $SUB_DEPENDS_STATUS

@@ -267,13 +267,13 @@ function generic_remove_stale() {
local tmp=$TMP_DIR/delint.$2.stale
local t
awk -F: '
- BEGIN {
- while (getline < "'$SPELL_STATUS'")
- Installed[$1] = 1;
- }
- {
- if ( ! Installed[$1])
- print $0;
+ BEGIN {
+ while (getline < "'$SPELL_STATUS'")
+ Installed[$1] = 1;
+ }
+ {
+ if ( ! Installed[$1])
+ print $0;
}' "$1" |tee $tmp
t=$(wc -l $tmp | awk '{print $1;}')
message "\t$t bad lines, $(( $(wc -l $1| cut -f1 -d' ') - t))" \
@@ -301,29 +301,29 @@ function prune_depends()
local action=""
local LINE DISPEL_LIST CAST_LIST
local choice options provider spell
-
+
# actualy do the actions, or just output what should be done
if [[ $1 == doit ]] ; then
action="doit"
fi
-
+
# Lock the depends file so no one messes with it while it's being worked on
- lock_file $DEPENDS_STATUS
-
+ lock_file $DEPENDS_STATUS
+
# Get a list of bad dependencies
# Output is in the form "SPELL DEPENDENCY optional/reqired PROVIDER"
bad=( $( awk -F: '
- BEGIN {
- while (getline < "'$SPELL_STATUS'")
- Installed[$1] = 1;
- }
- $3=="on"{
+ BEGIN {
+ while (getline < "'$SPELL_STATUS'")
+ Installed[$1] = 1;
+ }
+ $3=="on"{
if($2 ~ "[(].*[)]")
prov=gensub("^.*\$(.*)\$.*$", "\\1", 1, $2);
else
prov="__BLANK__";
gsub("\$.*\$", "", $2)
- if ( Installed[$1] && ! Installed[$2] && $2!="")
+ if ( Installed[$1] && ! Installed[$2] && $2!="")
printf("%s %s %s %s\n", $1, $2, $4, prov);
}' $DEPENDS_STATUS ) )

@@ -366,9 +366,9 @@ function prune_depends()
elif [[ $3 == suggest ]] ; then
options=( "Ignore" "Dispel $1" "Cast $2" "Disable $2 in $1"
"${options[@]}" )
fi
-
+
#Get the user's choice of action
- select_list choice "" "${options[@]}"
+ select_list choice "" "${options[@]}"
case ${choice} in
I*) message "Ignoring." ;;
Dispel*) echo $1 >> $TMP_DIR/prune.dispel ;;
@@ -378,7 +378,7 @@ function prune_depends()
sed 's/^$'$1':'$2':$on$:optional:.*$$/\1off\2/' $DEPENDS_STATUS
> $TMP_DIR/prune.1
mv $TMP_DIR/prune.1 $DEPENDS_STATUS
;;
- Disable*)
+ Disable*)
sed 's/^$'$1':'$2':$on$:suggest:.*$$/\1off\2/' $DEPENDS_STATUS >
$TMP_DIR/prune.1
mv $TMP_DIR/prune.1 $DEPENDS_STATUS
;;
@@ -386,20 +386,20 @@ function prune_depends()
mv $TMP_DIR/prune.1 $DEPENDS_STATUS
echo $1 >>$TMP_DIR/prune.cast
;;
- *) message "We should never get here."
+ *) message "We should never get here."
exit 1
;;
esac
shift 4
done
-
- unlock_file $DEPENDS_STATUS
-
+
+ unlock_file $DEPENDS_STATUS
+
# put the spells in two files for later perusal
if [[ $action ]] ; then
- [ -s $TMP_DIR/prune.dispel ] &&
+ [ -s $TMP_DIR/prune.dispel ] &&
dispel $( sort $TMP_DIR/prune.dispel | uniq )
- [ -s $TMP_DIR/prune.cast ] &&
+ [ -s $TMP_DIR/prune.cast ] &&
cast -c $( sort $TMP_DIR/prune.cast | uniq )
else
t=$(date +%Y%m%d%s)
@@ -420,7 +420,7 @@ function packages()
local spell t LINE
message "Fixing packages..."
lock_file $SPELL_STATUS
-
+
message "Pass 1 (bad lines)"
sed -n '/^[^:]*:[^:]*:[^:]*:[^:]*$/!p' $SPELL_STATUS >
$TMP_DIR/packages.bad
if [ -s $TMP_DIR/packages.bad ] ; then
@@ -432,7 +432,7 @@ function packages()
message "\tRemoving bad entries"
mv $TMP_DIR/packages.good $SPELL_STATUS
fi
-
+
message "Pass 2 (non-existant spells)"
t=""
for spell in $( sed -n 's/^$[^:]*$:.*$/\1/p' $SPELL_STATUS ) ; do
@@ -448,7 +448,7 @@ function packages()
message "these spells went. They may have been deprecated and then"
message "removed. You may want to dispel these if that is the case."
fi
-
+
message "Pass 3 (duplicate entries)"
t=$(
for LINE in $( sed -n 's/^$[^:]*$:$[^:]*$:.*$/\1/p' $SPELL_STATUS |
sort | uniq -d ) ; do
@@ -460,7 +460,7 @@ function packages()
message "\tRemoving bad entries"
mv $TMP_DIR/packages.3 $SPELL_STATUS
fi
-
+
unlock_file $SPELL_STATUS
message "Done fixing packages."
}
@@ -528,15 +528,15 @@ function cleanse_fix()
echo
echo ".PHONY : all $SPELLS"
) > $MAKEFILE
-
+
# load our ldd hash with the spells we know we'll care about
# but no more then necessary
cleanse_fix_init_ldd_check $($REAL_MAKE -s -f $MAKEFILE all 2>/dev/null)

local PASSED FIXED HOPELESS TOTALNR CURNR unused
-
+
CURNR=0
-
+
if [ $FIX == quick ] ; then
TOTALNR=0 #counting them like this doesn't seem to take substantial time
for unused in $SPELLS ; do let TOTALNR++ ; done
@@ -627,11 +627,11 @@ function cleanse_fix_spell() {
return 1
fi

- cast -c $SPELL &&
+ cast -c $SPELL &&
cleanse_fix_run_checks $SPELL &&
FIXED="${FIXED}${SPELL}"$'\n' &&
return 0
-
+
# if we get here the spell is deemed hopeless

HOPELESS="${HOPELESS}${SPELL}"$'\n'
@@ -670,7 +670,7 @@ function cleanse_fix_run_checks() {
## @FIXME The skipped directories should be made configurable somewhere
## @return 0 The files were all in existance
## @return 1 At least one file was found missing
-##
+##
#-----------------------
function cleanse_fix_find_check() {
if [ "$FIND_CHECK" == "off" ] ; then
@@ -713,7 +713,7 @@ function cleanse_fix_find_check() {
if [[ $BADLIST ]] ; then
message "${PROBLEM_COLOR}The following files from" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" \
- "${PROBLEM_COLOR}don't exist: "$'\n'"${DEFAULT_COLOR}"
+ "${PROBLEM_COLOR}don't exist: "$'\n'"${DEFAULT_COLOR}"
message "$BADLIST"

return 1
@@ -729,9 +729,9 @@ function cleanse_fix_find_check() {
## what library directories a spell has libraries in, this is because
## some spells have their own private libraries and arent happy if
## they dont know where they are
-##
+##
#-----------------------
-function cleanse_fix_init_ldd_check() {
+function cleanse_fix_init_ldd_check() {
if [ "$LDD_CHECK" == "off" ] ; then
return 0
fi
@@ -758,7 +758,7 @@ function cleanse_fix_init_ldd_check() {
## Check that all libraries the spell binaries need exist
## @return 0 The libraries have their requirements met
## @return 1 At least one library isnt happy
-##
+##
#-----------------------
function cleanse_fix_ldd_check() { (
if [ "$LDD_CHECK" == "off" ] ; then
@@ -830,7 +830,7 @@ function cleanse_fix_ldd_check() { (
## Check that all symlink targets exist
## @return 0 The symlinks point to real files
## @return 1 At least one symlink doesnt have its target
-##
+##
#-----------------------
function cleanse_fix_sym_check() {
if [ "$SYM_CHECK" == "off" ] ; then
@@ -889,7 +889,7 @@ function cleanse_fix_sym_check() {
## Verify the md5sum of all the files
## @return 0 The md5sum of a file is incorrect
## @return 1 At least one md5sum is wrong
-##
+##
#-----------------------
function cleanse_fix_md5sum_check() {

@@ -994,7 +994,7 @@ function cleanse_fix_md5sum_check() {
message -n '.'

test -d $POSSESSED_LOGS || mkdir -p $POSSESSED_LOGS
-
+
possessed=$POSSESSED_LOGS/$SPELL-$2
lock_start_transaction "$possessed" tfile
echo $LINE >> $tfile
diff --git a/usr/sbin/delve b/usr/sbin/delve
index c459a64..54f2fd6 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -308,7 +308,7 @@ function delve_make_continuation() {
local API1="start PRE_BUILD config_loc BUILD POST_BUILD POST_INSTALL
TRIGGERS end"
local API2="start PRE_BUILD config_loc BUILD PRE_INSTALL INSTALL
INSTALL_EXTRAS POST_INSTALL TRANSFER FINAL TRIGGERS end"
local THIS_API
- case $BUILD_API in
+ case $BUILD_API in
1) THIS_API=$API1 ;;
2) THIS_API=$API2 ;;
*) message "Unknown api for spell $SPELL: \"$BUILD_API\"" ; return 1;;
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index a3d8482..467f5f1 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -24,7 +24,7 @@ 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
+search -short "phrase" Searches for "phrase" in the short spell
descriptions

provides feature Displays spells that provide the feature.
@@ -78,7 +78,7 @@ 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]
+voyeur [delay or spell]
Peeks into spell compilation.

orphans <empty> Displays installed spells that no installed
@@ -130,7 +130,7 @@ function maybe_column() {
}

#-----
-## Make building multiple identical systems easy with exporint of a
+## Make building multiple identical systems easy with exporint of a
## snapshot of the current state.
## <p>Is this actualy used for anything still? Does it work?
#-----
@@ -158,7 +158,7 @@ function export_snapshot() {
else
tar -cf $SNAPSHOT snapshot
fi
-
+
rm_source_dir $SOURCE_DIRECTORY
echo "$SNAPSHOT created."

@@ -237,15 +237,15 @@ function alien() {
rm -f $TMP_DIR/gaze.found
rm -f $TMP_DIR/gaze.known

- [[ $GAZE_VERBOSE != 0 ]] &&
+ [[ $GAZE_VERBOSE != 0 ]] &&
message "Discovering installed files..."
- { cat $SORCERY_INSTALL_LOG ; find $INSTALL_LOGS/ -type f|xargs cat ; } |
+ { cat $SORCERY_INSTALL_LOG ; find $INSTALL_LOGS/ -type f|xargs cat ; } |
files | sort > $TMP_DIR/gaze.known

- [[ $GAZE_VERBOSE != 0 ]] &&
+ [[ $GAZE_VERBOSE != 0 ]] &&
message "Discovering ambient files..."
find $GAZE_ALIEN_PATHS | files | filter "$EXCLUDED" | sort
>$TMP_DIR/gaze.found
-
+
diff -B -a -d $TMP_DIR/gaze.found $TMP_DIR/gaze.known |
grep -v "^> " |
grep "^< " |
@@ -272,7 +272,7 @@ function gaze_catalog() {
if [[ $? != 0 ]]; then
echo "No such grimoire $1"
exit 1;
- fi
+ fi
fi

[[ $GAZE_VERBOSE != 0 ]] && echo "Sorcery Grimoire for `date -u`"
@@ -287,9 +287,9 @@ function gaze_catalog() {

for SECTION in `codex_get_all_sections $grimoire`; do
if [[ $GAZE_VERBOSE != 0 ]]; then
- echo
+ echo
echo "-------------------------------------------------"
- echo "SECTION: $( basename $SECTION )"
+ echo "SECTION: $( basename $SECTION )"
echo "-------------------------------------------------"
else
echo
@@ -319,7 +319,7 @@ function gaze_catalog_html() {
shift;
(( COLS++ ))
fi
-
+
if [[ $# -gt 0 ]]; then
grimoire=$(codex_find_grimoire $1)
if [[ $? != 0 ]]; then
@@ -617,7 +617,7 @@ function show_spell_component() {

#-----------------------------------------------------------------------
## parameter processing for the search routines.
-## the case statement should be self-explanatory
+## the case statement should be self-explanatory
## @param (optional) Type pf search (-name or -short)
## @param words to search for
#-----------------------------------------------------------------------
@@ -634,7 +634,7 @@ function gaze_search() {
#-----------------------------------------------------------------------
##
## searches for pattern(s) in the name of all spells.
-## it searches in the codex.index files for the sake of speed
+## it searches in the codex.index files for the sake of speed
##
## @Args Patterns
##
@@ -654,7 +654,7 @@ function real_name_search() {
print $1
}
else {
- print "'"$pattern"' -> ", $1
+ print "'"$pattern"' -> ", $1
}
}
' "$grimoire/$SPELL_INDEX_FILE"
@@ -666,7 +666,7 @@ function real_name_search() {
#-----------------------------------------------------------------------
##
## Searches for something in a specified grimoire. Not really sure what
-## it looks for or why.
+## it looks for or why.
##
## @param Path to grimoire
## @param Spell to look for
@@ -684,7 +684,7 @@ function grep_find_grimoire() {

#-----------------------------------------------------------------------
##
-## searches for pattern(s) in the SHORT field of every SPELL in every
+## searches for pattern(s) in the SHORT field of every SPELL in every
## grimoire
##
## @Args Patterns
@@ -703,7 +703,7 @@ function real_short_search() {
if [[ $GAZE_VERBOSE == 0 ]]; then
echo $spellname
else
- echo "$pattern -> $spellname"
+ echo "$pattern -> $spellname"
fi

done
@@ -715,7 +715,7 @@ function real_short_search() {

#-----------------------------------------------------------------------
##
-## searches for pattern(s) in the long description of every SPELL in every
+## searches for pattern(s) in the long description of every SPELL in every
## grimoire
##
## @Args Patterns
@@ -996,13 +996,13 @@ function gaze_show_section_version_table() {
echo "Grimoire|Section|Spell|Grimoire Version|Installed Version"
echo "--------|-------|-----|----------------|-----------------"

- for spell in $SPELLS; do
+ for spell in $SPELLS; do

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

- done
+ done

) | maybe_column -t -s "|"

@@ -1012,7 +1012,7 @@ function gaze_show_section_version_table() {
#---------------------------------------------------------------------
##
## Shows the versions of spells, both the version in the grimoire and
-## the version installed on the system.
+## the version installed on the system.
## @param Spell
## @param ...
##
@@ -1022,14 +1022,14 @@ function gaze_show_spell_version_table() {
(
echo "Grimoire|Section|Spell|Grimoire Version|Installed Version"
echo "--------|-------|-----|----------------|-----------------"
-
- for SPELL in $@; do
+
+ for SPELL in $@; do

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

- done
+ done

) | maybe_column -t -s "|"

@@ -1039,13 +1039,13 @@ function gaze_show_spell_version_table() {
#---------------------------------------------------------------------
##
## Shows the versions of spells, both the version in the grimoire and
-## the version installed on the system.
+## the version installed on the system.
## @param Spell or section
## @param ...
##
#---------------------------------------------------------------------
function gaze_show_version() {
-
+
local SPELLS_AND_SECTIONS=$@
local SPELLS=
local UNKNOWN=
@@ -1063,7 +1063,7 @@ function gaze_show_version() {

else
UNKNOWN="$spell_or_section $UNKNOWN"
- fi
+ fi

done

@@ -1081,7 +1081,7 @@ function gaze_show_version() {

#---------------------------------------------------------------------
##
-## Shows the all versions of spell, all versions in all grimoires and
+## Shows the all versions of spell, all versions in all grimoires and
## the version installed on the system.
## @param Spell
##
@@ -1134,7 +1134,7 @@ function gaze_show_versions() {

#---------------------------------------------------------------------
##
-## Shows the all versions of spell, all versions in all grimoires and
+## Shows the all versions of spell, all versions in all grimoires and
## the version installed on the system.
## @param Spell
##
@@ -1205,12 +1205,12 @@ function gaze_show_section_license_table() {
echo "Section|Spell|License(s)"
echo "-------|-----|----------"

- for spell in $SPELLS; do
+ for spell in $SPELLS; do

codex_set_current_spell $spell &&
echo "$SECTION|$SPELL|${LICENSE[@]}"

- done
+ done

) | maybe_column -t -s "|"

@@ -1229,13 +1229,13 @@ function gaze_show_spell_license_table() {
(
echo "Spell|License(s)"
echo "-----|----------"
-
- for SPELL in $@; do
+
+ for SPELL in $@; do

codex_set_current_spell $SPELL &&
echo "$SPELL|${LICENSE[@]}"

- done
+ done

) | maybe_column -t -s "|"

@@ -1246,7 +1246,7 @@ function gaze_show_spell_license_table() {
##
## Shows the information about the given licenses.
## @param Licence
-## @param ...
+## @param ...
##
#---------------------------------------------------------------------
function gaze_show_license_table() {
@@ -1254,11 +1254,11 @@ function gaze_show_license_table() {
echo "Abbr|License Full Name|URL"
echo "----|-----------------|---"

- for LICENSE in $@; do
+ for LICENSE in $@; do

grep -i "^$LICENSE|" ${SM_LICENSE_LIST} 2> /dev/null

- done
+ done

) | maybe_column -t -s "|"

@@ -1288,7 +1288,7 @@ function gaze_show_grimoires() {
##
#---------------------------------------------------------------------
function gaze_show_license() {
-
+
local SPELLS_AND_SECTIONS_AND_LICENSES=$@
local SPELLS=
local LICENSES=
@@ -1309,7 +1309,7 @@ function gaze_show_license() {
LICENSES="$LICENSES $spell_section_or_license"
else
UNKNOWN="$spell_section_or_license $UNKNOWN"
- fi
+ fi

done

@@ -1378,7 +1378,7 @@ function gaze_show_short_description() {
{ message "No details found"
return 1
}
- else
+ else
message "$spell -> no such spell"
return 1
fi
@@ -1406,7 +1406,7 @@ function gaze_show_long_description() {
message "No details found" &&
return 1
}
- else
+ else
message "$spell -> no such spell"
return 1
fi
@@ -1540,7 +1540,7 @@ function gaze_show_dependencies() {
}
repeat () {
local CHAR="$1" COUNT="$2"
-
+
while (( COUNT-- )); do echo -en "$CHAR"; done
}

@@ -1554,7 +1554,7 @@ function gaze_show_dependencies() {

# 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=""
@@ -1563,25 +1563,25 @@ function gaze_show_dependencies() {
return ;
fi

-
+
[[ $MAX_DEPTH ]] && [[ $DEPTH -ge $MAX_DEPTH ]] && return 1
grep () {
local foo
smgl_which grep foo &&
$foo "$@"
}
- [[ $FOUND ]] &&
- grep -q '^'$name'$' $FOUND &&
+ [[ $FOUND ]] &&
+ grep -q '^'$name'$' $FOUND &&
found_before=" (see above for tree)"
-
+
repeat "\t" $DEPTH
echo "$name ($WHAT)${found_before}"
- if [[ $found_before ]] ; then
+ if [[ $found_before ]] ; then
return ;
elif [[ $FOUND ]] ; then
echo "$name" >> $FOUND
fi
-
+
local SPELL_DIRECTORY=$(codex_find_spell_by_name $name)
[[ -e "$SPELL_DIRECTORY/DEPENDS" ]] &&
(
@@ -1589,7 +1589,7 @@ function gaze_show_dependencies() {
define_functions ':;' grep
codex_get_spell_paths $SPELL_DIRECTORY
source "$SPELL_DIRECTORY/DEPENDS" 2>/dev/null
- )
+ )
}
recurse $SPELL
)
@@ -1736,7 +1736,7 @@ function gaze_system_info()
## base_system="$(gaze dependencies basesystem 2 | sed
## -e "s/()//" -e 's/ (depends)//' -e 's/ (optional)//' | tr "\n" " " )"
#---
-
+
version="$(figure_installed basesystem)"
section="$(codex_get_spell_section_name basesystem)"
message -n "${MESSAGE_COLOR}${section}/basesystem:\t"
@@ -1944,7 +1944,7 @@ function gaze_show_spells_by_status () {
parse() {

# Maintain "TMP_DIR is always set as a global" invariant in the case of
- # non-root users, this leaves vague security holes but they're limited
+ # non-root users, this leaves vague security holes but they're limited
# to files the non-root user can access.
# a future goal is to make mk_tmp_dirs work for regular users too...
if [ "$UID" -gt 0 ]; then
@@ -1956,7 +1956,7 @@ parse() {
[[ $UID != 0 ]] && test "$NICE" -lt 0 && NICE=0
renice $NICE -p $$ >/dev/null

- while [[ -n "$1" ]] && [[ ${1:0:1} == "-" ]] ; do
+ while [[ -n "$1" ]] && [[ ${1:0:1} == "-" ]] ; do
case $1 in
-q) GAZE_VERBOSE=0
PAGER=cat
diff --git a/usr/sbin/invoke b/usr/sbin/invoke
index cb3cd02..d8ab130 100755
--- a/usr/sbin/invoke
+++ b/usr/sbin/invoke
@@ -4,7 +4,7 @@
##=head1 SYNOPSIS
##
## invoke the sorcery menuing tool for installed spells.
-## It can be called by the user or by cast
+## It can be called by the user or by cast
##
##=head1 DESCRIPTION
##
@@ -12,7 +12,7 @@
## track of the menu items for installed spells. Displaying
## it's own (dialog, or Xdialog) interface, or generating
## entries into your favorite window managers native menuing
-## system (that part is not implemented yet).
+## system (that part is not implemented yet).
##
##=head1 COPYRIGHT
##
@@ -49,7 +49,7 @@ generate menu_type Generates a menu (see below for
menu types)
(Not Implemented Yet).

update [spell] Updates the scry menu index with all spells
- registered to display in the menu.
+ registered to display in the menu.

"Supported" menu types:

@@ -101,8 +101,8 @@ make_list() {

local section=$1

- #for line in `grep ":$section:" $MENU_STATUS`; do
- function inv104() {
+ #for line in `grep ":$section:" $MENU_STATUS`; do
+ function inv104() {
echo "DEBUG: inside the loop line=$line" >> DEBUG
local spell=`echo $* | cut -d : -f1`
local script_directory=`codex_find_spell_by_name $spell`
@@ -115,7 +115,7 @@ make_list() {
echo $VERSION
echo \"`echo $line | cut -d : -f5`\"
echo \"`echo $line | cut -d : -f5`\" >> DEBUG
- #echo $line | awk -F : '{print $NF;}'
+ #echo $line | awk -F : '{print $NF;}'
fi
}
iterate "inv104" "$ENTER_IFS" `grep ":$section:" $MENU_STATUS`
@@ -127,7 +127,7 @@ process_selection() {

local section=$1
local spell=`esc_str $2`
- local line=`grep "^$spell:" $MENU_STATUS`
+ local line=`grep "^$spell:" $MENU_STATUS`
local command=`echo $line | cut -d : -f4`
$command &

@@ -144,7 +144,7 @@ select_section() {
--menu \
"" \
0 0 10 \
- `show_sections`
+ `show_sections`

}

@@ -155,7 +155,7 @@ show_sections() {

function inv152() {
# Display only unique sections
- if ! [ `echo $found | grep "$1"` ]; then
+ if ! [ `echo $found | grep "$1"` ]; then
found="$1 $found"
echo $1
echo "section"
@@ -177,7 +177,7 @@ update_menu_index() {
cp $MENU_STATUS $MENU_STATUS_BACKUP

local spell=$1
- local section=`find_section $spell`
+ local section=`find_section $spell`
local script_directory=`codex_find_spell_by_name $spell`
if [ -x $script_directory/DETAILS ]; then
. $script_directory/DETAILS > /dev/null
@@ -209,17 +209,17 @@ echo "DEBUG: no"

done
fi
-
+
else

message "${MESSAGE_COLOR}Updating menu index from installed
packages...${DEFAULT_COLOR}"
rm -f $MENU_STATUS_BACKUP
touch $MENU_STATUS_BACKUP
-
+
local line
for line in `cat $SPELL_STATUS`; do
local spell=`echo $line | cut -d : -f1`
- local section=`find_section $spell`
+ local section=`find_section $spell`
local script_directory=`codex_find_spell_by_name $spell`

if [ -x $script_directory/DETAILS ]; then
@@ -251,47 +251,47 @@ generate_menus() {
while [ -n "$1" ]; do

case $1 in
-
+
gnome) generate_gnome_menu shift 1 ;;
kde) generate_kde_menu shift 1 ;;
icewm) generate_icewm_menu shift 1 ;;
windowmaker) generate_windowmaker_menu shift 1 ;;
blackbox) generate_blackbox_menu shift 1 ;;
-
- esac
+
+ esac

done
-
+
}

-generate_gnome_menu() {
- echo "GNOME menus not implemented (yet)"
+generate_gnome_menu() {
+ echo "GNOME menus not implemented (yet)"
if [ "$UID" != 0 ]; then
MENU_DIR='/usr/share/gnome/apps'
- else
+ else
MENU_DIR="$HOME/.gnome/apps"
fi
}

-generate_kde_menu() {
- echo "KDE menus not implemented (yet)"
+generate_kde_menu() {
+ echo "KDE menus not implemented (yet)"
}

-generate_icewm_menu() {
- echo "IceWM menus not implemented (yet)"
+generate_icewm_menu() {
+ echo "IceWM menus not implemented (yet)"
}

-generate_windowmaker_menu() {
- echo "WindowMaker menus not implemented (yet)"
+generate_windowmaker_menu() {
+ echo "WindowMaker menus not implemented (yet)"
MENU_DIR="$HOME/GNUStep/Defaults/WMRootMenu"
}

-generate_blackbox_menu() {
- echo "Blackbox menus not implemented (yet)"
+generate_blackbox_menu() {
+ echo "Blackbox menus not implemented (yet)"
}

diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index fa61ad0..8df3723 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
## @scribe
-##
+##
## @Synopsis scribe handles adding/updating/reindexing/etc. of grimoires
##
## @Copyright
@@ -81,7 +81,7 @@ function unpackage_grimoire_tarball() {
message "ERROR: Grimoire tarball for $grim_name not" \
"formatted correctly!."
return 1
- fi
+ fi
return 0
else
message "ERROR: Grimoire tarball for $grim_name did not unpack properly!"
@@ -183,7 +183,7 @@ function scribe_add() {
scribe_add_update_worker "$grimoire" "$from" add
done
}
-
+
#---------------------------------------------------------------------
## scribe_add_worker
##
@@ -306,8 +306,8 @@ function scribe_add_update_worker() {
popd &>/dev/null

#success! create a GRIMOIRE file that stores where it was downloaded from
- echo "FROM_URL=$from" > $grimoire/GRIMOIRE &&
- chmod +x $grimoire/GRIMOIRE &&
+ echo "FROM_URL=$from" > $grimoire/GRIMOIRE &&
+ chmod +x $grimoire/GRIMOIRE &&

if [[ $add_or_update == add ]] ; then
codex_add_grimoire $grimoire 0 &&
@@ -401,7 +401,7 @@ function scribe_fix_metadata() {
#---------------------------------------------------------------------
function scribe_index() {
local idx grimoire
-
+
echo ""
echo "Codex Listing"
echo "-------------"
@@ -574,7 +574,7 @@ function scribe_set(){
let idx2-- # grim1 is before grim2, by removing grim1, the position
# decrease by 1
fi
-
+
message "Setting $grim1 before $grim2"
codex_remove_grimoire $grimoire1
codex_add_grimoire $grimoire1 $idx2
@@ -773,7 +773,7 @@ elif [[ $1 == -h ]] || [[ $1 == --help ]] ; then
help
elif [[ $1 == index ]] ; then
scribe_index # this requires no access privaledges so special case it
-else
+else
echo "Enter the root password, please." 1>&2
PARAMS=$(consolidate_params "$@")
su -c "$0 $PARAMS" root
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index dd8ee73..593f4f6 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -48,7 +48,7 @@ Optional Parameters:
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
+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
@@ -736,7 +736,7 @@ architecture_menu() {
hash_put archspec_hash $specname $SPECFILE
fi
done
-
+
# now that there archspecs have been found, build the dialog list
for specname in $(hash_get_table_fields archspec_hash|sort); do
CPUNAME=""
@@ -846,7 +846,7 @@ custom_optimization_menu() {
LDFLAGS) CUSTOM_LDFLAGS="$@" ;;
esac
done
-
+
# only commit values if user selected "OK"
if [ $rc == 0 ] ; then
modify_local_config CUSTOM_CFLAGS "$CUSTOM_CFLAGS"
@@ -1194,7 +1194,7 @@ function service_defaults() {
local INSTALL_XINETD_HELP="Install xinetd scripts by default?"
local ENABLE_XINETD_HELP="If an xinetd script is being installed, also
enable it by default?"
local INIT_VS_XINETD="If both xinetd or init.d scripts exist, prefer
xinetd over init.d?"
-
+
local MENU_TITLE="Init.d/Xinetd Default Answer Selection Menu"
local MENU_INFO="Choose your defaults\nPer spell answers are remembered on
recasts"
local RESULT RESULTS TMP i
@@ -2001,7 +2001,7 @@ if [ "$UID" == 0 ]; then
cleanup_tmp_dir $TMP_DIR
exit $rc
else
- if [[ $1 == -h ]] || [[ $1 == --help ]] || [[ $1 == help ]]; then
+ if [[ $1 == -h ]] || [[ $1 == --help ]] || [[ $1 == help ]]; then
help
else
if [[ $1 == -v ]] || [[ $1 == --version ]] || [[ $1 == version ]]; then
diff --git a/usr/sbin/summon b/usr/sbin/summon
index 34840e7..466c397 100755
--- a/usr/sbin/summon
+++ b/usr/sbin/summon
@@ -91,8 +91,8 @@ fi
-g|--grimoire) codex_set_grimoires $2; shift 2 ;;
-p|--print) set_print_type $2; shift 2 ;;
--queue) QUEUE=1; shift 1 ;;
- --all) SUMMON_ALL=1; shift 1 ;;
- -r|--raw) RAW=1; shift 1 ;;
+ --all) SUMMON_ALL=1; shift 1 ;;
+ -r|--raw) RAW=1; shift 1 ;;
*) help; ;;
esac

@@ -223,7 +223,7 @@ main() {
list_install_queue
fi
spells_to_get=$(< $INSTALL_QUEUE)
- else
+ else
spells_to_get=`strip_parameters $*`
fi

@@ -246,7 +246,7 @@ if [ "$UID" == 0 ] ; then
cleanup_tmp_dir $TMP_DIR
exit $rc
elif [[ $1 == -h ]] || [[ $1 == --help ]] ; then help
-else
+else
echo "Enter the root password, please." 1>&2
PARAMS=$(consolidate_params "$@")
su -c "$0 $PARAMS" root
diff --git a/var/lib/sorcery/build/run_compiler
b/var/lib/sorcery/build/run_compiler
index 155cbe9..700f4d3 100644
--- a/var/lib/sorcery/build/run_compiler
+++ b/var/lib/sorcery/build/run_compiler
@@ -13,7 +13,7 @@
##=head1 COPYRIGHT
##
## Copyright (C) 2002 Robert Helgesson <rycee AT home.se>
-##
+##
##=head1 FUNCTIONS
#---------------------------------------------------------------------

diff --git a/var/lib/sorcery/modules/build_api/api1
b/var/lib/sorcery/modules/build_api/api1
index f345d4b..0ac1664 100755
--- a/var/lib/sorcery/modules/build_api/api1
+++ b/var/lib/sorcery/modules/build_api/api1
@@ -29,7 +29,7 @@ function run_build_spell() {
STAGED_INSTALL=off
rm -f $C_LOG
touch $C_LOG
- if [[ $SCREEN_NAME ]] ; then
+ if [[ $SCREEN_NAME ]] ; then
screen_new_window "$SCREEN_NAME" $SCREEN_CAST_WIN "cast $SPELL" \
tail -f -s 0.1 $C_LOG
screen_switch_window "$SCREEN_NAME" $SCREEN_MAIN_WIN
@@ -58,7 +58,7 @@ function run_build_spell() {
run_post_install || return 3
)
rs=$?
-
+
if [[ $SCREEN_NAME ]] && [ $rs -gt 0 ] ; then
screen_move_window "$SCREEN_NAME" $SCREEN_CAST_WIN
$SCREEN_LAST_FAILED_CAST_WIN
screen_name_window "$SCREEN_NAME" $SCREEN_LAST_FAILED_CAST_WIN "Failed
$SPELL"
@@ -67,11 +67,11 @@ function run_build_spell() {
elif [[ $SCREEN_NAME ]] ; then
screen_kill_window "$SCREEN_NAME" $SCREEN_CAST_WIN
fi
-
+
# Triggers don't run in the window
[ $rs -gt 0 ] && return $rs
run_triggers || return 4
-
+
return $rs
}

@@ -131,7 +131,7 @@ function run_build() {
"! Problem Detected !" \
"${DEFAULT_COLOR}"
return 1
- fi
+ fi
echo "Compile log for $SPELL $VERSION Completed Build on `date -u`" >>
$C_LOG

}
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 45fd0a6..983adad 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -31,7 +31,7 @@ function run_build_spell() {
export C_LOG=$TMP_DIR/$SPELL.compile.log
export CASTFS_DBGLOG=$C_LOG.castfs.dbglog
export C_FIFO=/dev/stdout # not needed for api2 anymore, but just in case
- export S_PWD=$TMP_DIR/build.saved.pwd
+ export S_PWD=$TMP_DIR/build.saved.pwd
export VOYEUR_STDOUT VOYEUR_STDERR
export __DELVE_IN_CAST=on

@@ -39,8 +39,8 @@ function run_build_spell() {
touch $CASTFS_DBGLOG
rm -f $C_LOG
touch $C_LOG
-
- if [[ $SCREEN_NAME ]] ; then
+
+ if [[ $SCREEN_NAME ]] ; then
screen_new_window "$SCREEN_NAME" $SCREEN_CAST_WIN "cast $SPELL" \
tail -f -s 0.1 $C_LOG
screen_switch_window "$SCREEN_NAME" $SCREEN_MAIN_WIN
@@ -55,7 +55,7 @@ function run_build_spell() {
VOYEUR_STDERR=/dev/null
fi

- if [[ -z $STAGED_INSTALL ]]
+ if [[ -z $STAGED_INSTALL ]]
then
if ! is_castfs_installed
then
@@ -104,7 +104,7 @@ function run_build_spell() {
elif [[ $SCREEN_NAME ]] ; then
screen_kill_window "$SCREEN_NAME" $SCREEN_CAST_WIN
fi
-
+
# triggers don't run in the window
[ $rs -gt 0 ] && return $rs

@@ -185,7 +185,7 @@ function run_pre_install() {
else
cd "$BUILD_DIRECTORY"
fi
-
+
run_spell_file PRE_INSTALL pre_install
echo "Compile log for $SPELL $VERSION Completed Build on `date -u`" >>
$C_LOG
pwd > $S_PWD
@@ -210,7 +210,7 @@ function run_install() {
fi

run_spell_file INSTALL install
-
+
if [ "$?" != 0 ]; then
message "${PROBLEM_COLOR}" \
"! Problem Detected !" \
@@ -220,7 +220,7 @@ function run_install() {
}

function run_install_extras() {
-
+
debug "build_api/api2" "Starting run_install_extras()"
run_spell_file INSTALL_EXTRAS install_extras
}
@@ -248,7 +248,7 @@ function run_post_install() {
}

#--------------------------------------------------------------------
-### Checks against STAGED_INSTALL and installs the staged spell
+### Checks against STAGED_INSTALL and installs the staged spell
### accordingly
##--------------------------------------------------------------------
function run_transfer() {
@@ -257,7 +257,7 @@ function run_transfer() {
run_spell_file TRANSFER transfer
fi
}
-
+
#---------------------------------------------------------------------
## Checks for a FINAL file in SCRIPT_DIRECTORY, and if it is
## executable, runs it. This file is used for extra files that need
@@ -286,7 +286,7 @@ function real_default_sorcery_pre_build() {

#---------------------------------------------------------------------
## @Type API
-## Used if no BUILD script is found
+## Used if no BUILD script is found
## Default build is:
## <pre>
## ./configure --build=$BUILD \
@@ -369,7 +369,7 @@ function real_default_sorcery_install_extras() {
}

function real_default_sorcery_transfer() {
-
+
debug "build_api/api2" "Starting real_default_sorcery_post_install"
transfer_staged_spell
}
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_cvs
b/var/lib/sorcery/modules/dl_handlers/dl_cvs
index 7f596d0..6823c4a 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_cvs
+++ b/var/lib/sorcery/modules/dl_handlers/dl_cvs
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Download handler for downloading cvs urls.
##
##=head1 DESCRIPTION
@@ -10,7 +10,7 @@
## This file contains functions for I<downloading> files through cvs.
##
## In order for cvs urls to be downloaded, the I<cvs> spell must have been
-## cast. This script first determines if cvs has been installed before
+## cast. This script first determines if cvs has been installed before
## attempting to download a cvs url.
##
##
@@ -27,7 +27,7 @@

#---------------------------------------------------------------------
##=item dl_get_cvs <url>
-##
+##
## Fetch the specified cvs url.
##
## This function always assumes that a tree is being downloaded (for now).
@@ -40,7 +40,7 @@
## No hints are defined currently.
##
#---------------------------------------------------------------------
-function dl_cvs_get() {
+function dl_cvs_get() {
dl_command_check cvs || return 254

local target=$1
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_dir
b/var/lib/sorcery/modules/dl_handlers/dl_dir
index 7a4bda9..5928343 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_dir
+++ b/var/lib/sorcery/modules/dl_handlers/dl_dir
@@ -2,23 +2,23 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for grabbing directory urls.
##
##=head1 DESCRIPTION
##
## This type of url was added as a response to the following request:
##
-## I'm an AbiWord developer, and I keep the latest source
-## tree in my abi directory. If I could make the abi spell
-## (not to be confused with the abispell) use my current
+## I'm an AbiWord developer, and I keep the latest source
+## tree in my abi directory. If I could make the abi spell
+## (not to be confused with the abispell) use my current
## CVS checked-out tree, that would be nice.
##
## This file contains functions for I<downloading> (actually it just
-## copies, tars, and compresses) directories which can be accessed
+## copies, tars, and compresses) directories which can be accessed
## through the local file system.
##
-## Url's of this type are specified using the format
+## Url's of this type are specified using the format
##
## dir://<directory>
##
@@ -38,7 +38,7 @@

#---------------------------------------------------------------------
##=item dl_get_dir <url>
-##
+##
## Copies the specified dir url.
##
#---------------------------------------------------------------------
@@ -62,7 +62,7 @@ function url_dir_get() {
message "Finished."
fi
done
-
+
eval "$dl_target=\"$target\""
eval "$dl_type=\"tree\""
return $rc
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_file
b/var/lib/sorcery/modules/dl_handlers/dl_file
index aa36001..6cdd25f 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_file
+++ b/var/lib/sorcery/modules/dl_handlers/dl_file
@@ -4,7 +4,7 @@
## @Synopsis Url handler functions for grabbing file urls.
## This file contains functions for I<downloading> (actually it just
## copies) files which can be accessed through the local file system.
-## Url's of this type are specified using the format
+## Url's of this type are specified using the format
##
## file://<path>
##
@@ -16,7 +16,7 @@

#---------------------------------------------------------------------
## @param url
-##
+##
## Copies the specified file url.
##
#---------------------------------------------------------------------
@@ -38,7 +38,7 @@ function dl_file_get() {
test -r "$FILENAME" &&
cp -a $FILENAME $target && break
done
-
+
eval "$dl_target=\"$target\""
eval "$dl_type=\"file\""
return $rc
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git
b/var/lib/sorcery/modules/dl_handlers/dl_git
index d6db216..9d73a48 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -14,13 +14,13 @@

#---------------------------------------------------------------------
##=item dl_get_git <url>
-##
+##
## Fetch the specified git url.
##
## This handler only supports tree downloads.
##
#---------------------------------------------------------------------
-function dl_git_get () {
+function dl_git_get () {
dl_command_check git || return 254

local target=$1
@@ -45,7 +45,7 @@ function dl_git_get () {
( cd $GIT_DIRECTORY &&
echo git-checkout $GIT_TAG &&
git-checkout $GIT_TAG &&
- echo git-pull $GIT_ROOT $GIT_TAG
+ echo git-pull $GIT_ROOT $GIT_TAG
git-pull $GIT_ROOT $GIT_TAG )
rc=$?
eval "$dl_target=\"$GIT_DIRECTORY\""
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_rsync
b/var/lib/sorcery/modules/dl_handlers/dl_rsync
index 3553121..1b2d5a1 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_rsync
+++ b/var/lib/sorcery/modules/dl_handlers/dl_rsync
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for downloading rsync urls.
##
##=head1 DESCRIPTION
@@ -10,7 +10,7 @@
## This file contains functions for I<downloading> files through rsync.
##
## In order for rsync urls to be downloaded, the I<rsync> spell must have
been
-## cast. This script first determines if rsync has been installed before
+## cast. This script first determines if rsync has been installed before
## attempting to download a rsync url.
##
##=head1 RSYNC URL Format
@@ -45,13 +45,13 @@

#---------------------------------------------------------------------
##=item dl_rsync_download <url>
-##
+##
## Fetch the specified rsync url.
##
## This handler supports both files and trees.
##
#---------------------------------------------------------------------
-function dl_rsync_get() {
+function dl_rsync_get() {
dl_command_check rsync || return 254

local target=$1
@@ -96,7 +96,7 @@ function dl_rsync_run_rsync() {
local COUNT=0
local position="a"
local use_spinner
-
+
if [ "$dl_file" == 1 ]; then
TOTAL=0 # downloading a single file, not a source tree
else
@@ -108,7 +108,7 @@ function dl_rsync_run_rsync() {
let TOTAL+=10
fi
fi
-
+
message "${MESSAGE_COLOR}Running rsync...${DEFAULT_COLOR}"
if [ $TOTAL -lt 10 ] ; then
echo rsync -rz --delete --stats --progress "$url" "$target"
@@ -117,7 +117,7 @@ function dl_rsync_run_rsync() {
else
echo rsync -rz --delete --stats -vv "$url" "$target"
{
- rsync -rz --delete --stats -vv "$url" "$target"
+ rsync -rz --delete --stats -vv "$url" "$target"
echo $? > $TMP_DIR/rsync.rc
} | tee $TMP_DIR/rsyncout$$ |
while read line ; do
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index c8393e2..c9e8a76 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -14,13 +14,13 @@

#---------------------------------------------------------------------
##=item dl_get_svn <url>
-##
+##
## Fetch the specified svn url.
##
## This handler only supports tree downloads.
##
#---------------------------------------------------------------------
-function dl_svn_get () {
+function dl_svn_get () {
dl_command_check svn || return 254

local target=$1
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_tla
b/var/lib/sorcery/modules/dl_handlers/dl_tla
index 2e7372b..4c70b89 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_tla
+++ b/var/lib/sorcery/modules/dl_handlers/dl_tla
@@ -2,10 +2,10 @@
##
----------------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for grabbing tla urls.
##
-##
+##
##=head1 COPYRIGHT
##
## Copyright 2005 the SourceMage Team
@@ -14,13 +14,13 @@

#
-----------------------------------------------------------------------------
##=item dl_get_tla <url>
-##
+##
## Fetch the specified tla url.
##
## This handler only supports tree downloads.
##
#
-----------------------------------------------------------------------------
-function dl_tla_get() {
+function dl_tla_get() {
dl_command_check tla || return 254

local target=$1
@@ -35,7 +35,7 @@ function dl_tla_get() {

for url in $url_list; do
local URL TLA_ARCHIVE TLA_LOCATION TLA_REVISION
-
+
if ! tla archives | grep -q "\<$TLA_ARCHIVE\>"; then
tla register-archive $TLA_ARCHIVE $TLA_LOCATION || {
message "${PROBLEM_COLOR}Error registering archive${DEFAULT_COLOR}"
@@ -67,7 +67,7 @@ function dl_tla_get() {
done

dl_disconnect
-
+
eval "$dl_target=\"$target\""
eval "$dl_type=\"tree\""
return $rc
diff --git a/var/lib/sorcery/modules/url_handlers/url_cvs
b/var/lib/sorcery/modules/url_handlers/url_cvs
index 68ac9f3..c92ddf9 100755
--- a/var/lib/sorcery/modules/url_handlers/url_cvs
+++ b/var/lib/sorcery/modules/url_handlers/url_cvs
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for grabbing cvs urls.
##
##=head1 DESCRIPTION
@@ -11,7 +11,7 @@
##
##=head1 CVS URL Format
##
-## There is no standard (that I know of) for cvs urls so we use a
+## There is no standard (that I know of) for cvs urls so we use a
## source mage specific format:
##
## cvs://CVSROOT:MODULE_NAME
@@ -22,13 +22,13 @@
##
## cvs://CVSROOT:MODULE_NAME:REVISION_TAG
##
-## The CVSROOT portion of the url may include information such as type of
cvs
-## server, port number for the server, user name, password, cvs repository
+## The CVSROOT portion of the url may include information such as type of cvs
+## server, port number for the server, user name, password, cvs repository
## directory, etc. The CVSROOT syntax is defined by cvs and is as follows:
-##
+##
## :method:[[user][:password]@]hostname[:[port]]/path/to/repository
##
-## For more details, see the CVS manual at
+## For more details, see the CVS manual at
## http://www.cvshome.org/docs/manual/cvs.html
##
##=head1 EXAMPLES
@@ -44,15 +44,15 @@
## cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main:1_0pre7
##
## Some cvs repositories require passwords. One such repository is the
-## cvs repository for the ROOT package (an object-oriented data analysis
-## framework, see L<http://root.cern.ch/root/>). The CVSROOT, without the
+## cvs repository for the ROOT package (an object-oriented data analysis
+## framework, see L<http://root.cern.ch/root/>). The CVSROOT, without the
## password, would look like this:
##
## :pserver:cvs AT root.cern.ch:/user/cvs
##
## The password for their cvs repository is I<cvs>. Adding the password
would
## make the CVSROOT look like this:
-##
+##
## :pserver:cvs:cvs AT root.cern.ch:/user/cvs
##
## Thus, the full cvs url, including the password, would be:
@@ -71,7 +71,7 @@

#---------------------------------------------------------------------
##=item url_file_download <url>
-##
+##
## Parse the specified cvs url.
##
## @global URL
@@ -80,12 +80,12 @@
## @global CVS_TAG
##
#---------------------------------------------------------------------
-function url_cvs_crack() {
+function url_cvs_crack() {

URL=`url_strip_prefix "$1" cvs`
CVS_ROOT=`echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#"`
local CVS_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#"`
- CVS_MODULE=`echo $CVS_MODULE_TAG | cut -d : -f2`
+ CVS_MODULE=`echo $CVS_MODULE_TAG | cut -d : -f2`
local CVS_TAGNAME=`echo $CVS_MODULE_TAG | cut -d : -f3`
CVS_TAG=${CVS_TAGNAME:=HEAD}

diff --git a/var/lib/sorcery/modules/url_handlers/url_default
b/var/lib/sorcery/modules/url_handlers/url_default
index ff97283..812cb46 100755
--- a/var/lib/sorcery/modules/url_handlers/url_default
+++ b/var/lib/sorcery/modules/url_handlers/url_default
@@ -1,7 +1,7 @@
#!/bin/bash
#---------------------------------------------------------------------
##
-## @Synopsis
+## @Synopsis
##
## Default implementations of url_handler api.
##
@@ -12,7 +12,7 @@
#---------------------------------------------------------------------
##=item url_default_bucketize
## @param url
-##
+##
## Outputs file as that is the dl handler for file:// urls
##
#---------------------------------------------------------------------
@@ -22,7 +22,7 @@ function url_default_bucketize() {

#---------------------------------------------------------------------
##=item url_default_crack
-##
+##
## Outputs the url with the prefix removed
##
#---------------------------------------------------------------------
@@ -41,10 +41,10 @@ function url_default_expand() {

#---------------------------------------------------------------------
##=item url_default_is_valid
-## @param url
+## @param url
##
## True if url_crack returns true
-##
+##
#---------------------------------------------------------------------
function url_default_is_valid() {
url_crack $1 >/dev/null
@@ -52,7 +52,7 @@ function url_default_is_valid() {

#---------------------------------------------------------------------
##=url_default_verify
-##
+##
## Always returns true
##
#---------------------------------------------------------------------
@@ -78,7 +78,7 @@ function url_default_hostname() {
#---------------------------------------------------------------------
function url_default_netselect() {
local each
- for each in $@ ; do
+ for each in $@ ; do
echo "0 $each"
done
}
diff --git a/var/lib/sorcery/modules/url_handlers/url_dir
b/var/lib/sorcery/modules/url_handlers/url_dir
index 0e8a25e..6625d51 100755
--- a/var/lib/sorcery/modules/url_handlers/url_dir
+++ b/var/lib/sorcery/modules/url_handlers/url_dir
@@ -2,23 +2,23 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for grabbing directory urls.
##
##=head1 DESCRIPTION
##
## This type of url was added as a response to the following request:
##
-## I'm an AbiWord developer, and I keep the latest source
-## tree in my abi directory. If I could make the abi spell
-## (not to be confused with the abispell) use my current
+## I'm an AbiWord developer, and I keep the latest source
+## tree in my abi directory. If I could make the abi spell
+## (not to be confused with the abispell) use my current
## CVS checked-out tree, that would be nice.
##
## This file contains functions for I<downloading> (actually it just
-## copies, tars, and compresses) directories which can be accessed
+## copies, tars, and compresses) directories which can be accessed
## through the local file system.
##
-## Url's of this type are specified using the format
+## Url's of this type are specified using the format
##
## dir://<directory>
##
@@ -37,8 +37,8 @@

#---------------------------------------------------------------------
##=item url_dir_verify <url>
-##
-## Verifies the specified directory exists. Returns true if the
+##
+## Verifies the specified directory exists. Returns true if the
## directory exists OR if the dir is an empty string.
##
#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/url_handlers/url_file
b/var/lib/sorcery/modules/url_handlers/url_file
index b8aabef..77e3c47 100755
--- a/var/lib/sorcery/modules/url_handlers/url_file
+++ b/var/lib/sorcery/modules/url_handlers/url_file
@@ -4,7 +4,7 @@
## @Synopsis Url handler functions for grabbing file urls.
## This file contains functions for I<downloading> (actually it just
## copies) files which can be accessed through the local file system.
-## Url's of this type are specified using the format
+## Url's of this type are specified using the format
##
## file://<path>
##
@@ -15,8 +15,8 @@
#---------------------------------------------------------------------

#---------------------------------------------------------------------
-## @param url
-##
+## @param url
+##
## Verifies the specified file exists. Returns true if the file exists
## OR if the file is an empty string.
##
diff --git a/var/lib/sorcery/modules/url_handlers/url_git
b/var/lib/sorcery/modules/url_handlers/url_git
index b90eee6..8934911 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git
+++ b/var/lib/sorcery/modules/url_handlers/url_git
@@ -2,14 +2,14 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for downloading git urls
##
##=head1 DESCRIPTION
##
-## This file contains functions for downloading and verifying
+## This file contains functions for downloading and verifying
## git urls. This file uses the "git" program.
-##
+##
##=head1 COPYRIGHT
##
## Copyright 2002 by the Source Mage Team
@@ -22,7 +22,7 @@

#---------------------------------------------------------------------
##=item url_git_crack <url>
-##
+##
## Parse the specified git url.
##
## @Global URL
@@ -55,7 +55,7 @@ function url_git_bucketize() {

#---------------------------------------------------------------------
##=item url_git_verify <url>
-##
+##
## Verifies the specified git url. Returns true if the url exists
## OR if the url is an empty string.
##
diff --git a/var/lib/sorcery/modules/url_handlers/url_git_http
b/var/lib/sorcery/modules/url_handlers/url_git_http
index 99202b2..12765a2 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git_http
+++ b/var/lib/sorcery/modules/url_handlers/url_git_http
@@ -2,14 +2,14 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for downloading git urls
##
##=head1 DESCRIPTION
##
-## This file contains functions for downloading and verifying
+## This file contains functions for downloading and verifying
## git urls. This file uses the "git" program.
-##
+##
##=head1 COPYRIGHT
##
## Copyright 2002 by the Source Mage Team
@@ -22,7 +22,7 @@

#---------------------------------------------------------------------
##=item url_git_crack <url>
-##
+##
## Parse the specified git url.
##
## @Global URL
@@ -45,7 +45,7 @@ function url_git_http_crack() {

#---------------------------------------------------------------------
##=item url_git_bucketize <url>
-##
+##
## echoes the download handler - git
##
#---------------------------------------------------------------------
@@ -55,7 +55,7 @@ function url_git_http_bucketize() {

#---------------------------------------------------------------------
##=item url_git_verify <url>
-##
+##
## Verifies the specified git url. Returns true if the url exists
## OR if the url is an empty string.
##
diff --git a/var/lib/sorcery/modules/url_handlers/url_rsync
b/var/lib/sorcery/modules/url_handlers/url_rsync
index 4a62fb7..7c74dc4 100755
--- a/var/lib/sorcery/modules/url_handlers/url_rsync
+++ b/var/lib/sorcery/modules/url_handlers/url_rsync
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for grabbing rsync urls.
##
##=head1 DESCRIPTION
@@ -10,7 +10,7 @@
## This file contains functions for I<downloading> files through rsync.
##
## In order for rsync urls to be downloaded, the I<rsync> spell must have
been
-## cast. This script first determines if rsync has been installed before
+## cast. This script first determines if rsync has been installed before
## attempting to download a rsync url.
##
##=head1 RSYNC URL Format
diff --git a/var/lib/sorcery/modules/url_handlers/url_smgl_tla
b/var/lib/sorcery/modules/url_handlers/url_smgl_tla
index 31272bc..b9bcb5b 100755
--- a/var/lib/sorcery/modules/url_handlers/url_smgl_tla
+++ b/var/lib/sorcery/modules/url_handlers/url_smgl_tla
@@ -2,7 +2,7 @@
##
----------------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for parsing smgl's tla urls.
##
##=head1 DESCRIPTION
@@ -11,7 +11,7 @@
##
##=head1 TLA URL Format
##
-## There is no standard (that I know of) for tla urls so we use a
+## There is no standard (that I know of) for tla urls so we use a
## source mage specific format:
##
## smgl_tla://location%archive%revision
@@ -21,7 +21,7 @@
## Revision is the category--branch--version[--patch] construct defined by
## tla.
##
-## For more details, see the tla manual at
+## For more details, see the tla manual at
## http://www.gnu.org/software/gnu-arch/
##
##=head1 EXAMPLES
@@ -29,13 +29,13 @@
## Suppose we want to download the latest version of the emacs-wiki
## scripts from tla. We'd use the following url:
##
-##
smgl_tla://http://sacha.free.net.ph/notebook/arch%sacha AT free.net.ph--main%emacs-wiki--stable--1.0

+##
smgl_tla://http://sacha.free.net.ph/notebook/arch%sacha AT free.net.ph--main%emacs-wiki--stable--1.0
##
## If we want the 1.0.13 release instead (i.e., patch level 13)
## we would use the following url:
##
##
smgl_tla://http://sacha.free.net.ph/notebook/arch%sacha AT free.net.ph--main%emacs-wiki--stable--1.0--patch-13
-##
+##
##=head1 COPYRIGHT
##
## Copyright 2005 the SourceMage Team
@@ -54,7 +54,7 @@ function url_smgl_tla_bucketize() {

#
-----------------------------------------------------------------------------
##=item url_smgl_tla_crack <url>
-##
+##
## Parse the url
##
## @global URL
@@ -63,8 +63,8 @@ function url_smgl_tla_bucketize() {
## @global TLA_REVISION
##
#
-----------------------------------------------------------------------------
-function url_smgl_tla_crack() {
-
+function url_smgl_tla_crack() {
+
URL=`url_strip_prefix "$1" smgl_tla`
TLA_LOCATION=`echo $URL|cut -d"%" -f1`
TLA_ARCHIVE=`echo $URL|cut -d"%" -f2`
@@ -74,7 +74,7 @@ function url_smgl_tla_crack() {

#
-----------------------------------------------------------------------------
##=item url_smgl_tla_is_valid<url>
-##
+##
## Verifies the specified tla url exists. Returns true for now...
##
#
----------------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/url_handlers/url_svn
b/var/lib/sorcery/modules/url_handlers/url_svn
index bf7c75f..af19970 100755
--- a/var/lib/sorcery/modules/url_handlers/url_svn
+++ b/var/lib/sorcery/modules/url_handlers/url_svn
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for parsing subversion urls.
##
##=head1 SVN URL Format
@@ -24,7 +24,7 @@
## which uses http:// as the underlying protocol, a hint may be specified
## named "old_svn_compat".
##
-## For more details, see the SVN manual at
+## For more details, see the SVN manual at
## http://svnbook.red-bean.com/svnbook/ch03s04.html
##
##=head1 EXAMPLES
@@ -53,7 +53,7 @@

#---------------------------------------------------------------------
##=item url_svn_crack <url>
-##
+##
## Parse the specified svn url.
##
## @Global URL
@@ -62,7 +62,7 @@
## @Global SVN_TAG
##
#---------------------------------------------------------------------
-function url_svn_crack() {
+function url_svn_crack() {

URL=`url_strip_prefix "$1" svn`
SVN_ROOT=`echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#"`
@@ -72,7 +72,7 @@ function url_svn_crack() {
SVN_ROOT=svn://$SVN_ROOT
fi
local SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#"`
- SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
+ SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
SVN_TAG=${SVN_TAGNAME:=HEAD}

diff --git a/var/lib/sorcery/modules/url_handlers/url_svn_http
b/var/lib/sorcery/modules/url_handlers/url_svn_http
index eac5c82..2392146 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_http
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_http
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for parsing subversion over http urls.
##
##=head1 DESCRIPTION
@@ -41,7 +41,7 @@
#---------------------------------------------------------------------
##=item url_svn_http_bucketize
## @param url
-##
+##
## Outputs svn as that is the dl handler for svn_http:// urls
#---------------------------------------------------------------------
function url_svn_http_bucketize() {
@@ -50,7 +50,7 @@ function url_svn_http_bucketize() {

#---------------------------------------------------------------------
##=item url_file_download <url>
-##
+##
## Parse the specified svn_http url.
##
## @Global URL
@@ -59,12 +59,12 @@ function url_svn_http_bucketize() {
## @Global SVN_TAG
##
#---------------------------------------------------------------------
-function url_svn_http_crack() {
+function url_svn_http_crack() {

URL=`url_strip_prefix "$1" svn_http`
SVN_ROOT=http://`echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#"`
local SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#"`
- SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
+ SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
SVN_TAG=${SVN_TAGNAME:=HEAD}

diff --git a/var/lib/sorcery/modules/url_handlers/url_svn_https
b/var/lib/sorcery/modules/url_handlers/url_svn_https
index e145b66..7e71645 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_https
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_https
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for parsing subversion over https urls.
##
##=head1 DESCRIPTION
@@ -41,7 +41,7 @@
#---------------------------------------------------------------------
##=item url_svn_https_bucketize
## @param url
-##
+##
## Outputs svn as that is the dl handler for svn_https:// urls
#---------------------------------------------------------------------
function url_svn_https_bucketize() {
@@ -50,7 +50,7 @@ function url_svn_https_bucketize() {

#---------------------------------------------------------------------
##=item url_file_download <url>
-##
+##
## Parse the specified svn_https url.
##
## @Global URL
@@ -59,12 +59,12 @@ function url_svn_https_bucketize() {
## @Global SVN_TAG
##
#---------------------------------------------------------------------
-function url_svn_https_crack() {
+function url_svn_https_crack() {

URL=`url_strip_prefix "$1" svn_https`
SVN_ROOT=https://`echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#"`
local SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#"`
- SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
+ SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
SVN_TAG=${SVN_TAGNAME:=HEAD}

diff --git a/var/lib/sorcery/modules/url_handlers/url_svn_ssh
b/var/lib/sorcery/modules/url_handlers/url_svn_ssh
index 6c8ddb0..a2d2ec6 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_ssh
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_ssh
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
-##
+##
## Url handler functions for parsing smgl specific subversion over ssh urls.
##
##=head1 SVN URL Format
@@ -23,7 +23,7 @@
##
## The DIR_NAME will be the tail element of the SOURCE_DIRECTORY.
##
-## For more details, see the SVN manual at
+## For more details, see the SVN manual at
## http://svnbook.red-bean.com/svnbook/ch03s04.html
## and url_svn.
##
@@ -37,7 +37,7 @@
#---------------------------------------------------------------------
##=item url_svn_http_bucketize
## @param url
-##
+##
## Outputs svn as that is the dl handler for svn_http:// urls
#---------------------------------------------------------------------
function url_svn_ssh_bucketize() {
@@ -46,7 +46,7 @@ function url_svn_ssh_bucketize() {

#---------------------------------------------------------------------
##=item url_file_download <url>
-##
+##
## Parse the specified svn_ssh url.
##
## @Global URL
@@ -55,12 +55,12 @@ function url_svn_ssh_bucketize() {
## @Global SVN_TAG
##
#---------------------------------------------------------------------
-function url_svn_ssh_crack() {
+function url_svn_ssh_crack() {

URL=`url_strip_prefix "$1" svn_ssh`
SVN_ROOT=svn+ssh://`echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#"`
local SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#"`
- SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
+ SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
SVN_TAG=${SVN_TAGNAME:=HEAD}

[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (439131106e5cf96e470162cf03a32f75c4bfe244), Jaka Kranjc, 01/31/2008