sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Ismael Luceno (a3db552bb4df62887bc9d386ef3d88a054441bc3)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (a3db552bb4df62887bc9d386ef3d88a054441bc3)
- Date: Thu, 7 Feb 2019 22:50:23 +0000
GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:
usr/sbin/cabal | 72 ++++----
usr/sbin/cast | 24 +-
usr/sbin/dispel | 2
usr/sbin/gaze | 44 ++--
usr/sbin/scribe | 6
usr/sbin/sorcery | 188
++++++++++-----------
usr/sbin/summon | 4
usr/sbin/vcast | 2
var/lib/sorcery/modules/build_api/api1 | 7
var/lib/sorcery/modules/build_api/api2 | 10 -
var/lib/sorcery/modules/build_api/common | 1
var/lib/sorcery/modules/dl_handlers/dl_dir | 2
var/lib/sorcery/modules/dl_handlers/dl_file | 2
var/lib/sorcery/modules/dl_handlers/dl_rsync | 2
var/lib/sorcery/modules/libapi | 1
var/lib/sorcery/modules/libcast | 4
var/lib/sorcery/modules/libcodex | 18 +-
var/lib/sorcery/modules/libcrossinstall | 22 +-
var/lib/sorcery/modules/libdepends | 2
var/lib/sorcery/modules/libdispel | 26 +-
var/lib/sorcery/modules/libdownload | 2
var/lib/sorcery/modules/libhash | 2
var/lib/sorcery/modules/libinitd | 1
var/lib/sorcery/modules/libmedia | 8
var/lib/sorcery/modules/libmisc | 6
var/lib/sorcery/modules/libsecurity | 36 ++--
var/lib/sorcery/modules/libsorcery | 32 +--
var/lib/sorcery/modules/libstate | 2
var/lib/sorcery/modules/libtrack | 2
var/lib/sorcery/modules/libtriggers | 2
var/lib/sorcery/modules/liburl | 4
var/lib/sorcery/modules/url_handlers/url_cvs | 10 -
var/lib/sorcery/modules/url_handlers/url_dir | 2
var/lib/sorcery/modules/url_handlers/url_file | 2
var/lib/sorcery/modules/url_handlers/url_http | 4
var/lib/sorcery/modules/url_handlers/url_smgl_tla | 8
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 | 10 -
40 files changed, 303 insertions(+), 299 deletions(-)
New commits:
commit a3db552bb4df62887bc9d386ef3d88a054441bc3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
Add missing shebangs
commit 62934684669a30412d1a5d705bca614f0febeb01
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
Replace backticks
diff --git a/usr/sbin/cabal b/usr/sbin/cabal
index 13f5908..c6f0db8 100755
--- a/usr/sbin/cabal
+++ b/usr/sbin/cabal
@@ -93,7 +93,7 @@ select_cabal() {
#----------------------
edit_cabals() {
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do edit_file "$CABAL_DIRECTORY/$SELECTED"
done
@@ -104,7 +104,7 @@ edit_cabals() {
#---------------------
show_cabals() {
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do show_file "$CABAL_DIRECTORY/$SELECTED"
done
@@ -115,7 +115,7 @@ show_cabals() {
#--------------------
generate_cabal_key() {
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do
mkdir -p $CABAL_KEYS
@@ -133,8 +133,8 @@ generate_cabal_key() {
all_cabal_keys() {
- for KEY in `ls $CABAL_KEYS/* |
- grep -v "\.pub"`
+ for KEY in $(ls $CABAL_KEYS/* |
+ grep -v "\.pub")
do echo "-i"
echo "$KEY"
done
@@ -144,7 +144,7 @@ all_cabal_keys() {
distribute_cabal_key() {
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do
mkdir -p $CABAL_KEYS
@@ -161,7 +161,7 @@ distribute_cabal_key() {
cat $CABAL_DIRECTORY/$SELECTED |
while read BOX
do cat $CABAL_KEYS/$SELECTED.pub |
- ssh `all_cabal_keys` \
+ ssh $(all_cabal_keys) \
root@$BOX \
"cat >> $AK2; \
sort $AK2 | \
@@ -174,7 +174,7 @@ distribute_cabal_key() {
revoke_cabal_key() {
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do
mkdir -p $CABAL_KEYS
@@ -189,8 +189,8 @@ revoke_cabal_key() {
cat $CABAL_DIRECTORY/$SELECTED |
while read BOX
- do REVOKE=KEY="`cat $CABAL_KEYS/$SELECTED.pub`"
- ssh `all_cabal_keys` \
+ do REVOKE=KEY="$(cat $CABAL_KEYS/$SELECTED.pub)"
+ ssh $(all_cabal_keys) \
root@$BOX \
"grep -v "$REVOKE_KEY" $AK2 | \
sort > $AK2"
@@ -205,15 +205,15 @@ name_cabals() {
TITLE="Name Cabals Menu"
HELP="Please enter cabal's name"
- while SELECTED=`select_cabal`
+ while SELECTED=$(select_cabal)
do
- if NAME=`$DIALOG --title "$TITLE" \
+ if NAME=$($DIALOG --title "$TITLE" \
--ok-label "Enter" \
--cancel-label "Cancel" \
--inputbox \
"$HELP" \
- 0 0 ${CABALS[$SELECTED]}`
+ 0 0 ${CABALS[$SELECTED]})
then
CABALS[$SELECTED]="$NAME"
fi
@@ -228,10 +228,10 @@ set_max_cabals() {
PROMPT="Please enter the maximum number of cabals"
- if NEW_MAX=`eval $DIALOG '--ok-label "Commit" \
+ if NEW_MAX=$(eval $DIALOG '--ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$MAX_CABALS"'`
+ 0 0 "$MAX_CABALS"')
then
MAX_CABALS=$NEW_MAX
modify_local_config "MAX_CABALS" $MAX_CABALS
@@ -249,7 +249,7 @@ cabal_name_menu() {
E_HELP="Edit the names of the cabals"
TITLE="Cabal Name Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -257,7 +257,7 @@ cabal_name_menu() {
"$HELP" \
0 0 0 \
"S" "Show Cabal Names" "$S_HELP" \
- "E" "Edit Cabal Names" "$E_HELP"'`
+ "E" "Edit Cabal Names" "$E_HELP"')
do
case $COMMAND in
@@ -281,7 +281,7 @@ enable root login without password prompts"
R_HELP="Remove a previously installed cabal key"
TITLE="Cabal Key Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -290,7 +290,7 @@ enable root login without password prompts"
0 0 0 \
"G" "Generate Cabal Key" "$G_HELP" \
"D" "Distribute Cabal Key" "$D_HELP" \
- "R" "Revoke Cabal Key" "$R_HELP"'`
+ "R" "Revoke Cabal Key" "$R_HELP"')
do
case $COMMAND in
@@ -313,7 +313,7 @@ cabal_content_menu() {
E_HELP="Edit the computers which belong to a cabal"
TITLE="Cabal Content Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -321,7 +321,7 @@ cabal_content_menu() {
"$HELP" \
0 0 0 \
"S" "Show Cabal" "$S_HELP" \
- "E" "Edit Cabal" "$E_HELP"'`
+ "E" "Edit Cabal" "$E_HELP"')
do
case $COMMAND in
@@ -355,7 +355,7 @@ cabal_admin_menu() {
K_HELP="Generate and distribute keys for cabals"
TITLE="Cabal Admin Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -365,7 +365,7 @@ cabal_admin_menu() {
"N" "Cabal Name Menu" "$N_HELP" \
"C" "Cabal Content Menu" "$C_HELP" \
"K" "Cabal Key Menu" "$K_HELP" \
- "M" "Maximum Cabals: $MAX_CABALS" "$M_HELP"'`
+ "M" "Maximum Cabals: $MAX_CABALS" "$M_HELP"')
do
@@ -391,10 +391,10 @@ cabal_copy() {
exit 1
}
- SOURCE=`eval $DIALOG --inputbox $SOURCE_MESSAGE 0 0` &&
- DESTINATION=`eval $DIALOG --inputbox $DEST_MESSAGE 0 0` &&
- CABAL=`select_cabal` &&
- ORDER=`select_order` &&
+ SOURCE=$(eval $DIALOG --inputbox $SOURCE_MESSAGE 0 0) &&
+ DESTINATION=$(eval $DIALOG --inputbox $DEST_MESSAGE 0 0) &&
+ CABAL=$(select_cabal) &&
+ ORDER=$(select_order) &&
case $ORDER in
C) cat $CABAL_DIRECTORY/$CABAL |
@@ -427,9 +427,9 @@ cabal_execute() {
exit 1
}
- COMMAND=`eval $DIALOG '--inputbox "$COMMAND_MESSAGE" 0 0'` &&
- CABAL=`select_cabal` &&
- ORDER=`select_order` &&
+ COMMAND=$(eval $DIALOG '--inputbox "$COMMAND_MESSAGE" 0 0') &&
+ CABAL=$(select_cabal) &&
+ ORDER=$(select_order) &&
case $ORDER in
C) cat $CABAL_DIRECTORY/$CABAL |
@@ -459,7 +459,7 @@ cabal_execute() {
cabal_output() {
if [ -d $CABAL_OUTPUT ]; then
- for FILE in `ls $CABAL_OUTPUT`; do
+ for FILE in $(ls $CABAL_OUTPUT); do
echo "*------- $FILE Beginning Output -------*"
cat $CABAL_OUTPUT/$FILE
echo "*------- $FILE Ending Output -------*"
@@ -480,7 +480,7 @@ cabal_enchantment_menu() {
copies"
TITLE="Enchantment Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -489,7 +489,7 @@ copies"
0 0 0 \
"C" "Copy" "$A_HELP" \
"E" "Execute" "$E_HELP" \
- "S" "Show" "$S_HELP"'`
+ "S" "Show" "$S_HELP"')
do
@@ -515,7 +515,7 @@ cabal_menu() {
E_HELP="Execute scripts and copy files."
TITLE="Cabal Menu"
- COMMAND=`eval $DIALOG '--title "$TITLE" \
+ COMMAND=$(eval $DIALOG '--title "$TITLE" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -523,7 +523,7 @@ cabal_menu() {
"$HELP" \
0 0 0 \
"A" "Administration" "$A_HELP" \
- "E" "Enchantment" "$E_HELP"'`
+ "E" "Enchantment" "$E_HELP"')
do
@@ -540,7 +540,7 @@ cabal_menu() {
if [ -n "${PAGER}" ]
then
- PAGER=`which less`
+ PAGER=$(which less)
fi
DIALOG="${DIALOGPROG} --stdout"
diff --git a/usr/sbin/cast b/usr/sbin/cast
index c562257..ee715e3 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -480,7 +480,7 @@ pass_two() {
message "Download pass did not finish, killing it off."
# this is rather violent, but job control in bash lame and there's
# no other way to kill everything off effectively :-(
- pids="`ps x | awk -v t="$TMP_DIR" -v p=$$ -- '$0 ~ t && $1 != p {print
$1}'`"
+ pids="$(ps x | awk -v t="$TMP_DIR" -v p=$$ -- '$0 ~ t && $1 != p
{print $1}')"
for i in '' '' -9; do
kill $i $pids >/dev/null 2>&1
echo -n .; sleep 1
@@ -649,12 +649,12 @@ pass_five() {
touch $CHECK_TRIGGERS_FAILURE
touch $CONFLICT_LIST
- debug "pass_five" "SUCCESS LIST is : `cat $SUCCESS_LIST 2>/dev/null`"
- debug "pass_five" "FAILED LIST is : `cat $FAILED_LIST 2>/dev/null`"
- debug "pass_five" "CONFLICT LIST is : `cat $CONFLICT_LIST 2>/dev/null`"
- debug "pass_five" "CHECK_TRIGGERS_SUCCESS is : `cat
$CHECK_TRIGGERS_SUCCESS 2>/dev/null`"
- debug "pass_five" "bad_spells is : `hash_get_table_fields bad_spells`"
- debug "pass_five" "to_cast is : `hash_get_table_fields to_cast`"
+ debug "pass_five" "SUCCESS LIST is : $(cat $SUCCESS_LIST 2>/dev/null)"
+ debug "pass_five" "FAILED LIST is : $(cat $FAILED_LIST 2>/dev/null)"
+ debug "pass_five" "CONFLICT LIST is : $(cat $CONFLICT_LIST 2>/dev/null)"
+ debug "pass_five" "CHECK_TRIGGERS_SUCCESS is : $(cat
$CHECK_TRIGGERS_SUCCESS 2>/dev/null)"
+ debug "pass_five" "bad_spells is : $(hash_get_table_fields bad_spells)"
+ debug "pass_five" "to_cast is : $(hash_get_table_fields to_cast)"
if [ -s $SUCCESS_LIST ] ; then
@@ -663,7 +663,7 @@ pass_five() {
message "Spells installed successfully:"
message "------------------------------${SPELL_COLOR}"
- for item in `cat $SUCCESS_LIST 2>/dev/null`; do
+ for item in $(cat $SUCCESS_LIST 2>/dev/null); do
message "$item"
done | sort | column
@@ -675,7 +675,7 @@ pass_five() {
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger succeed:"
message "---------------------------------------------${SPELL_COLOR}"
- for item in `cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null`; do
+ for item in $(cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null); do
message "$item"
done | sort | column
message "${DEFAULT_COLOR}"
@@ -685,7 +685,7 @@ pass_five() {
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger fail:"
message "------------------------------------------${SPELL_COLOR}"
- for item in `cat $CHECK_TRIGGERS_FAILURE 2>/dev/null`; do
+ for item in $(cat $CHECK_TRIGGERS_FAILURE 2>/dev/null); do
message "$item"
done | sort | column
message "${DEFAULT_COLOR}"
@@ -740,7 +740,7 @@ pass_five() {
message "${MESSAGE_COLOR}The install queue is not empty, "
message "it still contains the following spells: "
message "---------------------------------------${PROBLEM_COLOR}"
- for item in `cat $INSTALL_QUEUE 2>/dev/null`; do
+ for item in $(cat $INSTALL_QUEUE 2>/dev/null); do
message "$item"
done | sort | column
message "${DEFAULT_COLOR}"
@@ -854,7 +854,7 @@ main() {
exit
fi
else
- SPELLS=`strip_parameters "$@"`
+ SPELLS=$(strip_parameters "$@")
fi
if [[ $OVERRIDE_GRIMOIRES ]] ; then
diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index 67e57c0..0c25b37 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -570,7 +570,7 @@ main() {
if [ "$DOWNGRADE_SPELL" ]; then
downgrade "$DOWNGRADE_SPELL" "$DOWNGRADE_VERSION"
fi
- SPELLS=`strip_parameters "$@"`
+ SPELLS=$(strip_parameters "$@")
if [ "$NONORPHAN_DEFAULT" ] || [ "$ORPHAN_DEFAULT" ]; then
CHILD_DEPS=yes
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index f1c11a3..43446ba 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -179,7 +179,7 @@ import_snapshot_old() {
cd $SOURCE_DIRECTORY
- for LINE in `cat install`; do
+ for LINE in $(cat install); do
push_install_queue $LINE
done
report $INSTALL_QUEUE "Install Queue"
@@ -292,7 +292,7 @@ import_snapshot() {
## @param File with list of files the sum
#-----
checksum() {
- for FILE in `cat $1 | files`; do
+ for FILE in $(cat $1 | files); do
sum -s $FILE
done
}
@@ -303,7 +303,7 @@ checksum() {
## @param File with list of files the sum
#-----
md5sum_files() {
- for FILE in `cat $1 | files`; do
+ for FILE in $(cat $1 | files); do
md5sum "$FILE"
done
}
@@ -360,7 +360,7 @@ gaze_catalog() {
fi
fi
- [[ $GAZE_VERBOSE != false ]] && echo "Sorcery Grimoire for `date -u`"
+ [[ $GAZE_VERBOSE != false ]] && echo "Sorcery Grimoire for $(date -u)"
if [ $grimoire ]; then
echo "Grimoire: " $(smgl_basename $grimoire)
@@ -370,7 +370,7 @@ gaze_catalog() {
COUNT=0
- for SECTION in `codex_get_all_sections $grimoire`; do
+ for SECTION in $(codex_get_all_sections $grimoire); do
if [[ $GAZE_VERBOSE != false ]]; then
echo
echo "-------------------------------------------------"
@@ -380,7 +380,7 @@ gaze_catalog() {
echo
echo "SECTION: $( smgl_basename $SECTION )"
fi
- for spell in `codex_get_spells_in_section $SECTION`; do
+ for spell in $(codex_get_spells_in_section $SECTION); do
smgl_basename $spell
(( COUNT++ ))
done
@@ -416,7 +416,7 @@ gaze_catalog_html() {
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 STRICT//EN\"
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>"
echo "<html xmlns=\"http://www.w3.org/1999/xhtml\";>"
echo "<head>"
- echo "<title>Sorcery Grimoires for `date -u`</title>"
+ echo "<title>Sorcery Grimoires for $(date -u)</title>"
echo "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=iso-8859-1\" />"
echo "<style type=\"text/css\" media=\"all\"> <!--"
echo "body"
@@ -509,12 +509,12 @@ gaze_catalog_html() {
(( COUNT=0 ))
- for SECTION in `codex_get_all_sections $grimoire`; do
+ for SECTION in $(codex_get_all_sections $grimoire); do
echo "<tr>"
echo "<th colspan=\"${COLS}\">"
echo "<h2>$( smgl_basename $SECTION )</h2>"
echo "</th></tr>"
- for SPELL in `codex_get_spells_in_section $SECTION`; do
+ for SPELL in $(codex_get_spells_in_section $SECTION); do
(
codex_set_current_spell $SPELL
@@ -535,7 +535,7 @@ gaze_catalog_html() {
echo "<td>$UPDATED</td>"
if [ "$WEB_SITE" != "unknown" ]; then
- WEBSITE="`echo $WEB_SITE | cut -c-30`..."
+ WEBSITE="$(echo $WEB_SITE | cut -c-30)..."
echo "<td>"
echo "<a href=\"$WEB_SITE\">$WEBSITE</a>"
echo "</td>"
@@ -610,7 +610,7 @@ newer() {
(
echo "Grimoire|Section|Spell|Grimoire Version|Installed Version|Added"
echo "--------|-------|-----|----------------|-----------------|-----"
- for SPELL_DIR in `codex_get_all_spells`; do
+ for SPELL_DIR in $(codex_get_all_spells); do
unset ENTERED
. "$SPELL_DIR/DETAILS" 1>/dev/null 2>&1
if [ "$ENTERED" ] && [ $ENTERED -gt $DATE ]; then
@@ -636,7 +636,7 @@ older() {
(
echo "Grimoire|Section|Spell|Grimoire Version|Installed Version|Added"
echo "--------|-------|-----|----------------|-----------------|-----"
- for SPELL_DIR in `codex_get_all_spells`; do
+ for SPELL_DIR in $(codex_get_all_spells); do
unset ENTERED
. "$SPELL_DIR/DETAILS" 1>/dev/null 2>&1
if [ "$ENTERED" ] && [ $ENTERED -lt $DATE ]; then
@@ -717,7 +717,7 @@ show_spell_component() {
local COMPONENT=$1
local SPELL_NAME=$2
- local SPELL_DIRECTORY=`codex_find_spell_by_name $SPELL_NAME`
+ local SPELL_DIRECTORY=$(codex_find_spell_by_name $SPELL_NAME)
if [ -z "$SPELL_DIRECTORY" ]; then
message "No such spell '$SPELL_NAME'"
@@ -928,8 +928,8 @@ specific_voyeur()
any_voyeur()
{
# We happily assume no spell names contain "cast."
- local FILE=`find /tmp/liblock-0 -maxdepth 1 -mindepth 1 -name "cast.*" |
- sed "s/.*\/cast\.//" | head -n 1`
+ local FILE=$(find /tmp/liblock-0 -maxdepth 1 -mindepth 1 -name "cast.*" |
+ sed "s/.*\/cast\.//" | head -n 1)
[ $FILE ] || return 1
debug "voyeur" "Looking at spell \"$FILE\""
nice -n +20 \
@@ -1053,7 +1053,7 @@ show_maintainer() {
for GRIMOIRE in $(codex_get_all_grimoires); do
codex_set_grimoires $GRIMOIRE
- SECTION=`codex_find_section_by_name $section`
+ SECTION=$(codex_find_section_by_name $section)
if [[ -d "$SECTION" ]]; then
if [[ -f "$SECTION/MAINTAINER" ]]; then
echo "$(smgl_basename
${GRIMOIRE})|$section|$(<$SECTION/MAINTAINER)"
@@ -1109,7 +1109,7 @@ gaze_show_section() {
#---------------------------------------------------------------------
gaze_show_section_version_table() {
- local SPELLS=`codex_get_spells_in_section $1`
+ local SPELLS=$(codex_get_spells_in_section $1)
(
@@ -1119,7 +1119,7 @@ gaze_show_section_version_table() {
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
@@ -1146,7 +1146,7 @@ gaze_show_spell_version_table() {
for SPELL in $@; do
codex_set_current_spell $SPELL &&
- local INSTALLED=`installed_version $SPELL` &&
+ local INSTALLED=$(installed_version $SPELL) &&
echo
"$GRIMOIRE_NAME|$SECTION|$SPELL|${VERSION:="-"}|${INSTALLED:="-"}"
done
@@ -1320,7 +1320,7 @@ gaze_show_patchlevels() {
#---------------------------------------------------------------------
gaze_show_section_license_table() {
- local SPELLS=`codex_get_spells_in_section $1`
+ local SPELLS=$(codex_get_spells_in_section $1)
(
@@ -1427,7 +1427,7 @@ gaze_show_license() {
[ -n "$CODEX_FOUND_SPELL" ] &&
SPELLS="$SPELLS $CODEX_FOUND_SPELL"
- elif grep -iq "^`esc_str $spell_section_or_license`|"
${SM_LICENSE_LIST} 2> /dev/null; then
+ elif grep -iq "^$(esc_str $spell_section_or_license)|"
${SM_LICENSE_LIST} 2> /dev/null; then
LICENSES="$LICENSES $spell_section_or_license"
else
UNKNOWN="$spell_section_or_license $UNKNOWN"
@@ -2372,7 +2372,7 @@ parse() {
SPELL=$2
SECTION=$2
- VERSION=`installed_version $SPELL`
+ VERSION=$(installed_version $SPELL)
case $1 in
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 7ac2289..3aa58a5 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -357,7 +357,7 @@ scribe_fix() {
if [[ $@ ]] ; then
grimoires=$@
else
- grimoires=`codex_get_all_grimoires`
+ grimoires=$(codex_get_all_grimoires)
fi
for grim in $grimoires; do
@@ -501,7 +501,7 @@ scribe_reindex() {
if [[ "$@" ]] ; then
grimoires="$@"
else
- grimoires=`codex_get_all_grimoires`
+ grimoires=$(codex_get_all_grimoires)
fi
for grim in $grimoires; do
@@ -534,7 +534,7 @@ scribe_reindex_keyword() {
if [[ "$@" ]] ; then
grimoires="$@"
else
- grimoires=`codex_get_all_grimoires`
+ grimoires=$(codex_get_all_grimoires)
fi
for grim in $grimoires; do
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index a902fa6..03c2fd0 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -101,7 +101,7 @@ mirror_list() {
select_mirror() {
- local MIRROR_LIST=`mirror_list $1`
+ local MIRROR_LIST=$(mirror_list $1)
eval $DIALOG ' --title "Select Mirror Please" \
--ok-label "Select" \
@@ -132,10 +132,10 @@ mirror_menu() {
while COMMAND=$(eval $DIALOG "$cmd"); do
MIRROR=${COMMAND}_URL
- if MIRROR_URL=`select_mirror $COMMAND`; then
+ if MIRROR_URL=$(select_mirror $COMMAND); then
if [ "$MIRROR_URL" == "Custom" ]; then
- MIRROR_URL=`eval $DIALOG ' --inputbox "Please enter the URL." 0
0'`
+ MIRROR_URL=$(eval $DIALOG ' --inputbox "Please enter the URL." 0
0')
fi &&
remove_config $LOCAL_CONFIG "$MIRROR" &&
@@ -153,8 +153,8 @@ mirror_menu() {
show_spells() { (
- local SECTION=`codex_find_section_by_name $1`
- local SPELLS=`codex_get_spells_in_section $SECTION`
+ local SECTION=$(codex_find_section_by_name $1)
+ local SPELLS=$(codex_get_spells_in_section $SECTION)
for SPELL in $SPELLS; do
@@ -178,7 +178,7 @@ show_spells() { (
show_sections() {
- LIST=`codex_get_all_section_names | sort -u`
+ LIST=$(codex_get_all_section_names | sort -u)
for LINE in $LIST; do
echo $LINE
@@ -197,7 +197,7 @@ select_section() {
--menu \
"" \
0 0 0 \
- `show_sections`'
+ $(show_sections)'
}
@@ -206,25 +206,25 @@ add_pkgs() { (
while
- SECTION=`select_section`
+ SECTION=$(select_section)
do
while
- SPELLS=`show_spells $SECTION` &&
+ SPELLS=$(show_spells $SECTION) &&
! [ -z "$SPELLS" ] &&
- SPELL=`eval $DIALOG ' --title "Select spell to install please" \
+ SPELL=$(eval $DIALOG ' --title "Select spell to install please" \
--item-help \
--menu \
"$SECTION" \
0 0 0 \
- '$SPELLS`
+ '$SPELLS)
do
codex_set_current_spell_by_name $SPELL
- SPELL_DESCRIPTION=`codex_get_spell_description $SPELL_DIRECTORY`
+ SPELL_DESCRIPTION=$(codex_get_spell_description $SPELL_DIRECTORY)
if eval $DIALOG '--title "Install $SPELL" \
--yesno "$SPELL_DESCRIPTION" \
@@ -247,10 +247,10 @@ add_pkgs() { (
file_list() {
- LIST=`ls $1`
+ LIST=$(ls $1)
for LINE in $LIST; do
echo $LINE
- echo `file -b $1/$LINE | cut -d ' ' -f1`
+ echo $(file -b $1/$LINE | cut -d ' ' -f1)
done
}
@@ -258,10 +258,10 @@ file_list() {
file_menu() {
- FILE_LIST=`file_list $1`
- echo $1/`eval $DIALOG ' --title "Please select a file." \
+ FILE_LIST=$(file_list $1)
+ echo $1/$(eval $DIALOG ' --title "Please select a file." \
--menu "" 0 0 0 \
- $FILE_LIST'`
+ $FILE_LIST')
}
@@ -292,22 +292,22 @@ remove_pkgs() {
if [ -z "$INSTALLED_SPELLS" ]; then
echo "Discovering installed spells..."
- INSTALLED_SPELLS=`show_installed_spells`
+ INSTALLED_SPELLS=$(show_installed_spells)
fi
- SPELL=`eval $DIALOG ' --title "Select spell to remove please." \
+ SPELL=$(eval $DIALOG ' --title "Select spell to remove please." \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
--menu "" 0 0 0 \
- '$INSTALLED_SPELLS`
+ '$INSTALLED_SPELLS)
do
local DESCRIPTION="Description unavailable"
codex_set_current_spell_by_name $SPELL
- DESCRIPTION=`codex_get_spell_description $SPELL_DIRECTORY`
+ DESCRIPTION=$(codex_get_spell_description $SPELL_DIRECTORY)
if eval $DIALOG '--title "Remove $SPELL?" \
--yesno "$DESCRIPTION" \
@@ -479,8 +479,8 @@ rebuild() {
make_checklist() {
- local SECTION=`codex_find_section_by_name $1`
- local SPELLS=`codex_get_spells_in_section $SECTION`
+ local SECTION=$(codex_find_section_by_name $1)
+ local SPELLS=$(codex_get_spells_in_section $SECTION)
for SPELL in $SPELLS; do
@@ -507,9 +507,9 @@ make_checklist() {
process_section() {
- local SECTION=`codex_find_section_by_name $1`
+ local SECTION=$(codex_find_section_by_name $1)
local KEEP_LIST=$2
- local SPELLS=`ls $GRIMOIRE/$SECTION`
+ local SPELLS=$(ls $GRIMOIRE/$SECTION)
for SPELL in $SPELLS; do
@@ -530,18 +530,18 @@ select_pkgs() {
local SELECT_TITLE="Spell Toggle Selection Menu"
local SELECT_HELP="[X]=install [ ]=remove"
- while SECTION=`select_section`; do
+ while SECTION=$(select_section); do
- CHECKLIST=`make_checklist $SECTION`
+ CHECKLIST=$(make_checklist $SECTION)
- if OUTLIST=`eval $DIALOG ' --title "$SELECT_TITLE" \
+ if OUTLIST=$(eval $DIALOG ' --title "$SELECT_TITLE" \
--ok-label "Commit" \
--item-help \
--separate-output \
--checklist \
"$SELECT_HELP $SECTION" \
0 0 0 \
- '$CHECKLIST`
+ '$CHECKLIST)
then process_section "$SECTION" "$OUTLIST"
fi
@@ -554,7 +554,7 @@ make_hold_checklist() {
array=()
- for LINE in `sort $SPELL_STATUS`; do
+ for LINE in $(sort $SPELL_STATUS); do
explode "$LINE" ":" "array"
@@ -588,19 +588,19 @@ hold_pkgs() {
local array=()
local tSPELL_STATUS
- local CHECKLIST=`make_hold_checklist`
+ local CHECKLIST=$(make_hold_checklist)
local HOLD_TITLE="Select spells to hold or unhold"
local HOLD_HELP="[X]=held [ ]=installed"
- if OUTLIST=`eval $DIALOG ' --title "$HOLD_TITLE" \
+ if OUTLIST=$(eval $DIALOG ' --title "$HOLD_TITLE" \
--item-help \
--ok-label "Commit" \
--separate-output \
--checklist \
"$HOLD_HELP" \
0 0 0 \
- '$CHECKLIST`
+ '$CHECKLIST)
then
set_unheld $(get_all_spells_with_status "held")
set_held $OUTLIST
@@ -625,7 +625,7 @@ spell_menu() {
while
- COMMAND=`eval $DIALOG ' --title "$TITLE" \
+ COMMAND=$(eval $DIALOG ' --title "$TITLE" \
--item-help \
--ok-label "$OK" \
--cancel-label "$CANCEL" \
@@ -635,7 +635,7 @@ spell_menu() {
"H" "Hold" "$H_HELP" \
"R" "Remove" "$R_HELP" \
"S" "Select" "$S_HELP" \
- "U" "Update" "$U_HELP"'`
+ "U" "Update" "$U_HELP"')
do
case $COMMAND in
@@ -656,9 +656,9 @@ spell_menu() {
grep_install_logs() {
local WHAT
- if WHAT=`eval $DIALOG ' --inputbox \
+ if WHAT=$(eval $DIALOG ' --inputbox \
"Please enter full path and name of file" \
- 0 0'`
+ 0 0')
then
cd $INSTALL_LOGS
grep "$WHAT\$" * | $PAGER
@@ -722,16 +722,16 @@ architecture_menu() {
local CURRENT_ARCH="${!1}"
local NEW_ARCH
- if NEW_ARCH=`eval $DIALOG ' --title "$ARCH_TITLE" \
+ if NEW_ARCH=$(eval $DIALOG ' --title "$ARCH_TITLE" \
--item-help \
--default-item "${CURRENT_ARCH}" \
--menu \
"$ARCH_HELP" \
0 0 0 \
- '$LIST `; then
+ '$LIST ); then
# remove spurious ""
- NEW_ARCH=`echo "${NEW_ARCH}" | sed -e 's/^"//' -e 's/"$//'`
+ NEW_ARCH=$(echo "${NEW_ARCH}" | sed -e 's/^"//' -e 's/"$//')
debug "sorcery" "architecture_menu() - NEW_ARCH='$NEW_ARCH'"
@@ -757,7 +757,7 @@ optimization_menu(){
local TINY_HELP="Optimize to smaller generated code, conflicts with
'speedy' (CFLAGS=$SMALL)"
local AS_NEEDED_HELP="Only emit DT_NEEDED entries for directly used
libraries (LDFLAGS=-Wl,--as-needed)"
- if OPTIMIZATIONS=`eval $DIALOG ' --title "$OPT_TITLE" \
+ if OPTIMIZATIONS=$(eval $DIALOG ' --title "$OPT_TITLE" \
--no-cancel \
--item-help \
--separate-output \
@@ -769,10 +769,10 @@ optimization_menu(){
"speedy" " +size ++speed" "$SPEEDY" "$SPEEDY_HELP" \
"strip" " --size" "$STRIP" "$STRIP_HELP" \
"tiny" " -size +speed" "$TINY" "$TINY_HELP" \
- "as_needed" "only direct libs" "$AS_NEEDED" "$AS_NEEDED_HELP"'`
+ "as_needed" "only direct libs" "$AS_NEEDED" "$AS_NEEDED_HELP"')
then
- OPTIMIZATIONS=`echo ${OPTIMIZATIONS} | tr '\n' ' '`
+ OPTIMIZATIONS=$(echo ${OPTIMIZATIONS} | tr '\n' ' ')
debug "sorcery" "optimization_menu() - OPTIMIZATIONS='${OPTIMIZATIONS}'"
modify_local_config "OPTIMIZATIONS" "$OPTIMIZATIONS"
@@ -787,13 +787,13 @@ custom_optimization_menu() {
# input box returns things of the form "RENAMED CFLAGS -O3 -march=foo
..."
# the ( ) interprits as an array, then using the magic power of set we
# get to use shift and $@ to get things done
- RESULTS=(`eval $DIALOG ' --extra-label Adjust --inputmenu \
+ RESULTS=($(eval $DIALOG ' --extra-label Adjust --inputmenu \
"Custom Optimizations Menu" \
17 50 9 \
CFLAGS "$CUSTOM_CFLAGS" \
CXXFLAGS "$CUSTOM_CXXFLAGS" \
LDFLAGS "$CUSTOM_LDFLAGS" \
- CPPFLAGS "$CUSTOM_CPPFLAGS"'`)
+ CPPFLAGS "$CUSTOM_CPPFLAGS"'))
rc=$?
[[ $rc == 0 ]] || [[ $rc == 1 ]] && break
set ${RESULTS[*]}
@@ -825,7 +825,7 @@ integrity_fix_menu() {
local SYM_HELP="Discover misowned symbolic links to files"
local MD5SUM_HELP="Discover modified binary executables, and libraries"
- if INT_FIX_CHECKS=`eval $DIALOG ' --title "$INT_TITLE" \
+ if INT_FIX_CHECKS=$(eval $DIALOG ' --title "$INT_TITLE" \
--no-cancel \
--item-help \
--separate-output \
@@ -835,7 +835,7 @@ integrity_fix_menu() {
"FIND_CHECK" "" "$FIND_CHECK" "$FIND_HELP" \
"MD5SUM_CHECK" "" "$MD5SUM_CHECK" "$MD5SUM_HELP" \
"LDD_CHECK" "" "$LDD_CHECK" "$LDD_HELP" \
- "SYM_CHECK" "" "$SYM_CHECK" "$SYM_HELP"'`
+ "SYM_CHECK" "" "$SYM_CHECK" "$SYM_HELP"')
then
FIND_CHECK=off
@@ -884,7 +884,7 @@ I off . . . . . - . - . . - . . . - .
local IGNORE_ASK_HELP="Ask, but default to ignore. UNSAFE"
local IGNORE_HELP="Ignore (do not check) integrity of downloads.
DANGEROUS!"
- if INT_DL_CHECK=`eval $DIALOG ' --title "$INT_DL_TITLE" \
+ if INT_DL_CHECK=$(eval $DIALOG ' --title "$INT_DL_TITLE" \
--no-cancel \
--ok-label "Commit" \
--item-help \
@@ -896,7 +896,7 @@ I off . . . . . - . - . . - . . . - .
"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"'`
+ "I" "Ignore (do not check)" "$IGNORE_HELP"')
then
case $INT_DL_CHECK in
P) modify_local_config "MD5SUM_DL" "abort_all" ;;
@@ -917,7 +917,7 @@ gpg_download_menu() {
local SRY_HELP="Toggle sorcery gpg signature checking on sorcery update"
local GRM_HELP="Toggle grimoire gpg signature checking on scribe update"
- if CHECKS=`eval $DIALOG ' --title "$INT_TITLE" \
+ if CHECKS=$(eval $DIALOG ' --title "$INT_TITLE" \
--no-cancel \
--item-help \
--separate-output \
@@ -925,7 +925,7 @@ gpg_download_menu() {
"$INT_HELP" \
0 0 0 \
"GPG_VERIFY_SORCERY" "" "$GPG_VERIFY_SORCERY" "$SRY_HELP" \
- "GPG_VERIFY_GRIMOIRE" "" "$GPG_VERIFY_GRIMOIRE" "$GRM_HELP"'`
+ "GPG_VERIFY_GRIMOIRE" "" "$GPG_VERIFY_GRIMOIRE" "$GRM_HELP"')
then
GPG_VERIFY_SORCERY=off
GPG_VERIFY_GRIMOIRE=off
@@ -1109,7 +1109,7 @@ integrity_menu() {
local SGPG_HELP="Verify GnuPG signatures on spell source tarballs"
local HGPG_HELP="Verify GnuPG signatures with selected hashs"
- while INT_CHECKS=`eval $DIALOG ' --title "$INT_TITLE" \
+ while INT_CHECKS=$(eval $DIALOG ' --title "$INT_TITLE" \
--cancel-label "Exit" \
--ok-label "Select" \
--item-help \
@@ -1120,7 +1120,7 @@ integrity_menu() {
"D" "Download integrity" "$DL_HELP" \
"G" "Sorcery GPG Signature Checking" "$GPG_HELP" \
"S" "Spell Source Verification Level Checking" "$SGPG_HELP" \
- "M" "Spell Source Hash List" "$HGPG_HELP"'`
+ "M" "Spell Source Hash List" "$HGPG_HELP"')
do
case $INT_CHECKS in
F) integrity_fix_menu ;;
@@ -1135,11 +1135,11 @@ integrity_menu() {
set_email() {
- if SORCERER=`eval $DIALOG ' --ok-label "Commit" \
+ if SORCERER=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"Please enter the email address of the person or role account
that should receive reports from this box." \
- 0 0 "$SORCERER"'`
+ 0 0 "$SORCERER"')
then
modify_local_config "SORCERER" "$SORCERER"
@@ -1158,7 +1158,7 @@ service_defaults() {
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
- if RESULTS=`eval $DIALOG '--item-help \
+ if RESULTS=$(eval $DIALOG '--item-help \
--backtitle backtitle \
--separate-output \
--title "$MENU_TITLE" \
@@ -1173,7 +1173,7 @@ service_defaults() {
"ENABLE_XINETD" "Enable xinetd scripts by default" \
"$DEF_ENABLE_XINETD" "$INSTALL_XINETD_HELP" \
"INIT_VS_XINETD" "Prefer xinetd over init.d" \
- "$DEF_INIT_VS_XINETD" "$INIT_VS_XINETD"'`
+ "$DEF_INIT_VS_XINETD" "$INIT_VS_XINETD"')
then
TEMP=(DEF_INSTALL_INIT DEF_ENABLE_INIT DEF_INSTALL_XINETD
DEF_ENABLE_XINETD DEF_INIT_VS_XINETD)
@@ -1207,13 +1207,13 @@ parallel_compilation_menu() {
# input box returns things of the form "RENAMED CFLAGS -O3 -march=foo
..."
# the ( ) interprits as an array, then using the magic power of set we
# get to use shift and $@ to get things done
- RESULTS=(`eval $DIALOG ' --extra-label Adjust --inputmenu \
+ RESULTS=($(eval $DIALOG ' --extra-label Adjust --inputmenu \
"$TITLE\n$HELP" \
23 70 9 \
DISTCC_HOSTS "$DISTCC_HOSTS" \
JOBS_PER_HOST "$JOBS_PER_HOST" \
EXTRA_JOBS "$MAKE_NJOBS" \
- CCACHE_DIR "$CCACHE_DIR"'`)
+ CCACHE_DIR "$CCACHE_DIR"'))
rc=$?
[[ $rc == 0 ]] || [[ $rc == 1 ]] && break
@@ -1247,7 +1247,7 @@ set_branch() {
while
- COMMAND=`eval $DIALOG ' --title "Currently tracking : $SORCERY_BRANCH "
\
+ COMMAND=$(eval $DIALOG ' --title "Currently tracking : $SORCERY_BRANCH
" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -1257,7 +1257,7 @@ set_branch() {
"S" "Stable Branch" "$S_HELP" \
"T" "Test Branch" "$T_HELP" \
"D" "Devel Branch" "$D_HELP" \
- "C" "Custom Branch" "$C_HELP"'`
+ "C" "Custom Branch" "$C_HELP"')
do
@@ -1282,14 +1282,14 @@ set_custom_branch() {
local C_HELP="Please choose the sorcery release/version you want to use,
this can be anything you want from
download.sourcemage.org/sorcery/sorcery-<version>.tar.bz2"
while
- COMMAND=`eval $DIALOG ' --title "Currently tracking : $SORCERY_BRANCH "
\
+ COMMAND=$(eval $DIALOG ' --title "Currently tracking : $SORCERY_BRANCH
" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
--inputbox \
"$C_HELP" \
0 0 \
- "$SORCERY_BRANCH"'`
+ "$SORCERY_BRANCH"')
do
@@ -1305,10 +1305,10 @@ set_custom_branch() {
set_delay() {
- if PROMPT_DELAY=`eval $DIALOG ' --ok-label "Commit" \
+ if PROMPT_DELAY=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"Please enter the time in seconds to wait for a
response when prompted with a question." \
- 0 0 "$PROMPT_DELAY"'`
+ 0 0 "$PROMPT_DELAY"')
then
modify_local_config "PROMPT_DELAY" "$PROMPT_DELAY"
@@ -1322,10 +1322,10 @@ set_download_rate() {
local PROMPT="Please enter the maximum bytes per second for summoning"
- if DOWNLOAD_RATE=`eval $DIALOG ' --ok-label "Commit" \
+ if DOWNLOAD_RATE=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$DOWNLOAD_RATE"'`
+ 0 0 "$DOWNLOAD_RATE"')
then
modify_local_config "DOWNLOAD_RATE" "$DOWNLOAD_RATE"
@@ -1338,10 +1338,10 @@ set_http_ftp_timeout() {
local PROMPT="Please enter maximum time (seconds) summon is to wait for
each download server"
- if URL_HTTP_FTP_TIMEOUT=`eval $DIALOG ' --ok-label "Commit" \
+ if URL_HTTP_FTP_TIMEOUT=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$URL_HTTP_FTP_TIMEOUT"'`
+ 0 0 "$URL_HTTP_FTP_TIMEOUT"')
then
modify_local_config "URL_HTTP_FTP_TIMEOUT" "$URL_HTTP_FTP_TIMEOUT"
@@ -1361,7 +1361,7 @@ queue_menu() {
while
- COMMAND=`eval $DIALOG ' --title "Queue Menu" \
+ COMMAND=$(eval $DIALOG ' --title "Queue Menu"
\
--ok-label "Select" \
--cancel-label "Exit" \
--default-item $COMMAND \
@@ -1374,7 +1374,7 @@ queue_menu() {
"R" "View removal queue" "$R_HELP" \
"r" "Edit removal queue" "$r_HELP" \
"S" "View spell status" "$S_HELP" \
- "s" "Edit spell status" "$s_HELP"'`
+ "s" "Edit spell status" "$s_HELP"')
do
lock_file $SPELL_STATUS
@@ -1408,7 +1408,7 @@ log_menu() {
while
- COMMAND=`eval $DIALOG ' --title "Log Menu" \
+ COMMAND=$(eval $DIALOG ' --title "Log Menu" \
--ok-label "Select" \
--cancel-label "Exit" \
--default-item $COMMAND \
@@ -1420,17 +1420,17 @@ log_menu() {
"I" "View install log" "$I_HELP" \
"i" "Edit install log" "$i_HELP" \
"C" "View compile log" "$C_HELP" \
- "c" "Remove compile log" "$c_HELP"'`
+ "c" "Remove compile log" "$c_HELP"')
do
case $COMMAND in
G) grep_install_logs ;;
- I) show_file `file_menu $INSTALL_LOGS` ;;
- i) edit_file `file_menu $INSTALL_LOGS` ;;
- C) show_file `file_menu $COMPILE_LOGS` ;;
- c) rm `file_menu $COMPILE_LOGS` ;;
+ I) show_file $(file_menu $INSTALL_LOGS) ;;
+ i) edit_file $(file_menu $INSTALL_LOGS) ;;
+ C) show_file $(file_menu $COMPILE_LOGS) ;;
+ c) rm $(file_menu $COMPILE_LOGS) ;;
esac
@@ -1446,7 +1446,7 @@ sorcery_devel_settings() {
while
- COMMAND=`eval $DIALOG '--title "Sorcery Development" \
+ COMMAND=$(eval $DIALOG '--title "Sorcery Development" \
--ok-label "Select" \
--cancel-label "Exit" \
--default-item $COMMAND \
@@ -1456,20 +1456,20 @@ sorcery_devel_settings() {
0 0 0 \
"D" "Debug file" "$D_HELP" \
"S" "Super debugging toggle" "$S_HELP" \
- "C" "Castfs debuging level" "$C_HELP"'`
+ "C" "Castfs debuging level" "$C_HELP"')
do
case $COMMAND in
D) TEXT="Note: if you turn this on, don't forget to empty the log file
occasionaly.\nWhat file do you want the debugging logged to?"
- FILE=`eval $DIALOG --ok-label "Commit" --inputbox \"$TEXT\" 0 0
\"$DEBUG\"` &&
+ FILE=$(eval $DIALOG --ok-label "Commit" --inputbox \"$TEXT\" 0 0
\"$DEBUG\") &&
modify_local_config "DEBUG" "$FILE" ;;
S) TEXT="Note: You don't want to do this probably. Don't forget to
2>/root/debug.out.\nDo you want super debugging on?"
- TOGGLE=`eval $DIALOG --yesno \"$TEXT\" 0 0` &&
+ TOGGLE=$(eval $DIALOG --yesno \"$TEXT\" 0 0) &&
( modify_local_config "SUPER_DEBUG" "on" ; modify_local_config "set"
"-x" "command" ) ||
( modify_local_config "SUPER_DEBUG" "" ; modify_local_config "set"
"+x" "command" ) ;;
C) TEXT="Note: This is a numeric value that represents a mask to
castfs, 0 means no debugging, 1 means file system debugging, 2 is lower level
debugging, 3 means both. All other values are currently undefined."
- LEVEL=`eval $DIALOG --ok-label "Commit" --inputbox \"$TEXT\" 0 0
\"$CASTFS_DEBUG_LEVEL\"` &&
+ LEVEL=$(eval $DIALOG --ok-label "Commit" --inputbox \"$TEXT\" 0 0
\"$CASTFS_DEBUG_LEVEL\") &&
modify_local_config "CASTFS_DEBUG_LEVEL" "$LEVEL" ;;
esac
@@ -1568,7 +1568,7 @@ feature_menu() {
local PSC_HELP="Ask for custom cflags for each spell"
local SHSQ_HELP="Show spell description option in queries for optional
dependencies"
- if TOGGLES=`eval $DIALOG ' --title "Feature Menu" \
+ if TOGGLES=$(eval $DIALOG ' --title "Feature Menu" \
--no-cancel \
--item-help \
--separate-output \
@@ -1597,7 +1597,7 @@ feature_menu() {
"SET_TERM_TITLE" "Toggle" "$SET_TERM_TITLE" "$ST_HELP" \
"SCREEN" "Toggle" "$SCREEN" "$SCR_HELP" \
"PER_SPELL_CFLAGS" "Toggle" "$PER_SPELL_CFLAGS" "$PSC_HELP" \
- "SHOW_GAZE_SHORT_QUERY" "Toggle" "$SHOW_GAZE_SHORT_QUERY"
"$SHSQ_HELP"'`
+ "SHOW_GAZE_SHORT_QUERY" "Toggle" "$SHOW_GAZE_SHORT_QUERY"
"$SHSQ_HELP"')
then
TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE CCACHE COLOR CONFIG_LOC
GATHER_DOCS MAIL_REPORTS PRESERVE SUSTAIN TMPFS VIEW_REPORTS VOYEUR REAP
STORE_CONF_LOG NET_SELECT CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN
PER_SPELL_CFLAGS SHOW_GAZE_SHORT_QUERY)
for i in ${TEMP[*]} ; do
@@ -1643,7 +1643,7 @@ option_menu() {
while
- COMMAND=`eval $DIALOG ' --title "Option Menu" \
+ COMMAND=$(eval $DIALOG ' --title "Option Menu" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -1668,7 +1668,7 @@ option_menu() {
"W" "Summon Timeout Value" "$W_HELP" \
"Y" "Default download tool" "$Y_HELP" \
"X" "init.d xinetd.d defaults" "$X_HELP" \
- "Z" "Select Sound Scheme" "$Z_HELP"'`
+ "Z" "Select Sound Scheme" "$Z_HELP"')
do
@@ -1714,12 +1714,12 @@ background_execute() {
eval "$DIALOG --msgbox \"Processing queues in the background.\" 0 0"
[[ -s $REMOVE_QUEUE ]] &&
- dispel `cat $REMOVE_QUEUE` 1>/dev/null 2>&1
+ dispel $(cat $REMOVE_QUEUE) 1>/dev/null 2>&1
rm -f $REMOVE_QUEUE
if [[ -s $INSTALL_QUEUE ]]; then
- cast --deps `cat $INSTALL_QUEUE`
- ( cast `cat $INSTALL_QUEUE` 1>/dev/null 2>&1 &&
+ cast --deps $(cat $INSTALL_QUEUE)
+ ( cast $(cat $INSTALL_QUEUE) 1>/dev/null 2>&1 &&
rm $INSTALL_QUEUE
) &
fi
@@ -1732,11 +1732,11 @@ background_execute() {
foreground_execute() {
[[ -s $REMOVE_QUEUE ]] &&
- dispel `cat $REMOVE_QUEUE`
+ dispel $(cat $REMOVE_QUEUE)
rm -f $REMOVE_QUEUE
[[ -s $INSTALL_QUEUE ]] &&
- cast `cat $INSTALL_QUEUE`
+ cast $(cat $INSTALL_QUEUE)
rm -f $INSTALL_QUEUE
goodbye
@@ -1759,7 +1759,7 @@ main_menu() {
local CANCEL="Exit"
while
- COMMAND=`eval $DIALOG ' --title "Main Menu" \
+ COMMAND=$(eval $DIALOG ' --title "Main Menu" \
--item-help \
--ok-label "$OK" \
--cancel-label "$CANCEL" \
@@ -1772,7 +1772,7 @@ main_menu() {
"Q" "Queue Menu" "$Q_HELP" \
"F" "Foreground Execute" "$F_HELP" \
"B" "Background Execute" "$B_HELP" \
- "I" "Install Root Menu" "$I_HELP"'`
+ "I" "Install Root Menu" "$I_HELP"')
do
case $COMMAND in
@@ -1999,7 +1999,7 @@ verify_parameters "$@"
if [ "$UID" = 0 ]; then
DIALOG='$DIALOGPROG --backtitle "Sorcery Spell Management Utility"
--stdout'
- SORCERY_VERSION=`cat /etc/sorcery/version`
+ SORCERY_VERSION=$(cat /etc/sorcery/version)
mk_tmp_dirs sorcery
init_hooks
main "$@"
diff --git a/usr/sbin/summon b/usr/sbin/summon
index 139df55..41369de 100755
--- a/usr/sbin/summon
+++ b/usr/sbin/summon
@@ -202,7 +202,7 @@ main() {
fi
if [ -n "$SUMMON_ALL" ]; then
- spells_to_get=`codex_get_all_spells|get_basenames`
+ spells_to_get=$(codex_get_all_spells|get_basenames)
elif [ -n "$QUEUE" ]; then
# Since sometimes we'll be running in raw output mode and possibly
@@ -218,7 +218,7 @@ main() {
fi
spells_to_get=$(< $INSTALL_QUEUE)
else
- spells_to_get=`strip_parameters $*`
+ spells_to_get=$(strip_parameters $*)
fi
if [ -n "$PRINT_TYPE" ]; then
diff --git a/usr/sbin/vcast b/usr/sbin/vcast
index 5b301e8..53cdd94 100755
--- a/usr/sbin/vcast
+++ b/usr/sbin/vcast
@@ -65,7 +65,7 @@ strip_parameters() {
}
process_parameters $*
-SPELLS=`strip_parameters $*`
+SPELLS=$(strip_parameters $*)
if [ -z "$*" ] ||
[ -n "$HELP" ]; then
diff --git a/var/lib/sorcery/modules/build_api/api1
b/var/lib/sorcery/modules/build_api/api1
index 88630eb..02992d3 100755
--- a/var/lib/sorcery/modules/build_api/api1
+++ b/var/lib/sorcery/modules/build_api/api1
@@ -1,3 +1,4 @@
+#!/bin/bash
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
@@ -104,8 +105,8 @@ run_build() {
debug "build_api1" "Starting run_build()"
- echo "Compile log for $SPELL $VERSION Built on `date -u`" > $C_LOG
- echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
+ echo "Compile log for $SPELL $VERSION Built on $(date -u)" > $C_LOG
+ echo "Using gcc version: $(gcc -dumpversion)" >> $C_LOG
# slight bug here if SOURCE_DIRECTORY doesnt exist
[ -d "$SOURCE_DIRECTORY" ] &&
@@ -132,7 +133,7 @@ run_build() {
"${DEFAULT_COLOR}"
return 1
fi
- echo "Compile log for $SPELL $VERSION Completed Build on `date -u`" >>
$C_LOG
+ 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 732c5e8..3ec9ef4 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -149,8 +149,8 @@ run_build() {
debug "build_api2" "Starting run_compile()"
- echo "Compile log for $SPELL $VERSION Built on `date -u`" > $C_LOG
- echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
+ echo "Compile log for $SPELL $VERSION Built on $(date -u)" > $C_LOG
+ echo "Using gcc version: $(gcc -dumpversion)" >> $C_LOG
message "${MESSAGE_COLOR}Building" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" >&3
@@ -188,7 +188,7 @@ run_pre_install() {
debug "build_api2" "Starting run_pre_install()"
if [ -f $S_PWD ] ; then
- cd "`cat $S_PWD`"
+ cd "$(cat $S_PWD)"
elif [ -d $SOURCE_DIRECTORY ] ; then
cd "$SOURCE_DIRECTORY"
else
@@ -197,7 +197,7 @@ run_pre_install() {
run_spell_file PRE_INSTALL pre_install
local rc=$?
- echo "Compile log for $SPELL $VERSION Completed Build on `date -u`" >>
$C_LOG
+ echo "Compile log for $SPELL $VERSION Completed Build on $(date -u)" >>
$C_LOG
pwd > $S_PWD
return $rc
}
@@ -223,7 +223,7 @@ run_install() {
fi
if [ -f $S_PWD ] ; then
- cd "`cat $S_PWD`"
+ cd "$(cat $S_PWD)"
elif [ -d $SOURCE_DIRECTORY ] ; then
cd "$SOURCE_DIRECTORY"
else
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 035e388..2f81dcc 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -1,3 +1,4 @@
+#!/bin/bash
#---------------------------------------------------------------------
##
##=head1 SYNOPSIS
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_dir
b/var/lib/sorcery/modules/dl_handlers/dl_dir
index c9258f2..db39536 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_dir
+++ b/var/lib/sorcery/modules/dl_handlers/dl_dir
@@ -55,7 +55,7 @@ url_dir_get() {
[[ $target ]] || return 255
for url in $url_list; do
- DIRNAME=`url_dir_crack $url`
+ DIRNAME=$(url_dir_crack $url)
if test -d "$DIRNAME" ; then
message "Copying $DIRNAME to $target."
cp -aR $DIRNAME $target &&
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_file
b/var/lib/sorcery/modules/dl_handlers/dl_file
index 3ca9ba3..7949ce0 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_file
+++ b/var/lib/sorcery/modules/dl_handlers/dl_file
@@ -33,7 +33,7 @@ dl_file_get() {
[[ $target ]] || return 255
for url in $url_list; do
- FILENAME=`url_crack $url` &&
+ FILENAME=$(url_crack $url) &&
test -f "$FILENAME" &&
test -r "$FILENAME" &&
cp -a $FILENAME $target && break
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_rsync
b/var/lib/sorcery/modules/dl_handlers/dl_rsync
index db1213c..b4767fc 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_rsync
+++ b/var/lib/sorcery/modules/dl_handlers/dl_rsync
@@ -70,7 +70,7 @@ dl_rsync_get() {
fi
for url in $url_list; do
- url=`url_rsync_crack "$url"`
+ url=$(url_rsync_crack "$url")
dl_rsync_run_rsync "$target" "$url" "$dl_target" "$dl_type"
rc=$?
[[ $rc == 0 ]] && break
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index 9804d5f..11f78ba 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -1,3 +1,4 @@
+#!/bin/bash
#----------------------------------------
##
## @Synopsis Defines the Spell-Sorcery Interface
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 0bd285c..75f3cc2 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -195,13 +195,13 @@ query_custom_cflags() {
# input box returns things of the form "RENAMED CFLAGS -O3 -march=foo
..."
# the ( ) interprits as an array, then using the magic power of set we
# get to use shift and $@ to get things done
- RESULTS=(`eval dialog --stdout ' --extra-label Adjust --inputmenu \
+ RESULTS=($(eval dialog --stdout ' --extra-label Adjust --inputmenu \
"Custom Optimizations Menu" \
17 50 9 \
CFLAGS "$USER_SPELL_CFLAGS" \
CXXFLAGS "$USER_SPELL_CXXFLAGS" \
LDFLAGS "$USER_SPELL_LDFLAGS" \
- CPPFLAGS "$USER_SPELL_CPPFLAGS"'`)
+ CPPFLAGS "$USER_SPELL_CPPFLAGS"'))
rc=$?
[[ $rc == 0 ]] || [[ $rc == 1 ]] && break
set ${RESULTS[*]}
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index 07f3b5c..c0d8840 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -185,7 +185,7 @@ codex_add_grimoire() {
codex_is_canonicalized $NEW_GRIMOIRE || return 1
- local GRIMOIRES=`codex_get_all_grimoires`
+ local GRIMOIRES=$(codex_get_all_grimoires)
local CURRENT_GRIMOIRE
local GRIMOIRE_COUNT=0
@@ -260,7 +260,7 @@ codex_remove_grimoire() {
codex_is_canonicalized $GRIMOIRE_TO_DELETE || return 1
- local GRIMOIRES=`codex_get_all_grimoires`
+ local GRIMOIRES=$(codex_get_all_grimoires)
lock_start_transaction "$GRIMOIRE_LIST" tGRIMOIRE_LIST
touch $GRIMOIRE_LIST
@@ -291,7 +291,7 @@ codex_remove_grimoire() {
#---------------------------------------------------------------------
codex_remove_duplicates() {
- local GRIMOIRES=`codex_get_all_grimoires`
+ local GRIMOIRES=$(codex_get_all_grimoires)
local CURRENT_GRIMOIRE=0
local GRIMOIRE_COUNT=0
local SEEN_GRIMOIRES=""
@@ -399,7 +399,7 @@ codex_find_section_by_name() {
local SECTION_NAME="$1"
local GRIMOIRE=''
- for GRIMOIRE in `codex_get_all_grimoires`; do
+ for GRIMOIRE in $(codex_get_all_grimoires); do
if [ -d "$GRIMOIRE/$SECTION_NAME" ] ; then
debug "libcodex" "codex_find_section_by_name() - found section
$GRIMOIRE/$SECTION_NAME"
if [[ -z $2 ]]; then
@@ -434,7 +434,7 @@ codex_get_all_sections() {
if [[ $# -gt 0 ]]; then
codex_get_sections $@
else
- codex_get_sections `codex_get_all_grimoires`
+ codex_get_sections $(codex_get_all_grimoires)
fi
}
@@ -527,7 +527,7 @@ codex_find_spell_by_name() {
debug "libcodex" "codex_find_spell_by_name - $*"
- codex_cache_spell_lookup $1 `codex_get_all_grimoires`
+ codex_cache_spell_lookup $1 $(codex_get_all_grimoires)
}
@@ -580,7 +580,7 @@ codex_get_spell_names() {
#---------------------------------------------------------------------
codex_get_all_spells() {
local section
- for section in `codex_get_all_sections $@`; do
+ for section in $(codex_get_all_sections $@); do
codex_get_spells_in_section $section
done
}
@@ -724,7 +724,7 @@ codex_get_spell_paths() {
#---------------------------------------------------------------------
codex_set_current_spell_by_name() {
debug "libcodex" "codex_set_current_spell_by_name -- $1"
- local SPELL_NAME=`codex_find_spell_by_name "$1"`
+ local SPELL_NAME=$(codex_find_spell_by_name "$1")
debug "libcodex" $SPELL_NAME
[ -n "$SPELL_NAME" ] && codex_set_current_spell $SPELL_NAME
@@ -1032,7 +1032,7 @@ codex_find_spell_or_section_by_name() {
codex_find_section_by_name $SPELL_OR_SECTION CODEX_FOUND_SECTION
[ -n "$CODEX_FOUND_SECTION" ] && return
- CODEX_FOUND_SPELL=`codex_find_spell_by_name $SPELL_OR_SECTION`
+ CODEX_FOUND_SPELL=$(codex_find_spell_by_name $SPELL_OR_SECTION)
[ -n "$CODEX_FOUND_SPELL" ] && return
return 1
diff --git a/var/lib/sorcery/modules/libcrossinstall
b/var/lib/sorcery/modules/libcrossinstall
index a313500..ab07131 100755
--- a/var/lib/sorcery/modules/libcrossinstall
+++ b/var/lib/sorcery/modules/libcrossinstall
@@ -24,7 +24,7 @@ install_root_menu() {
while
- COMMAND=`eval $DIALOG ' --title "Install Root Menu"
\
+ COMMAND=$(eval $DIALOG ' --title "Install Root Menu"
\
--item-help
\
--ok-label "Select"
\
--cancel-label "Exit"
\
@@ -34,7 +34,7 @@ install_root_menu() {
"C" "Set install cache location" "$C_HELP"
\
"I" "Set install root location" "$I_HELP"
\
"S" "Set state root location" "$S_HELP"
\
- "T" "Set track root location"
"$T_HELP"'`
+ "T" "Set track root location"
"$T_HELP"')
do
@@ -58,10 +58,10 @@ set_install_cache_menu() {
debug "libcrossinstall" "set_install_cache_menu - is starting..."
local PROMPT="Please enter the install cache location where cache tarballs
will be stored"
- if NEW_INSTALL_CACHE=`eval $DIALOG ' --ok-label "Commit" \
+ if NEW_INSTALL_CACHE=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$INSTALL_CACHE"'`
+ 0 0 "$INSTALL_CACHE"')
then
INSTALL_CACHE=${NEW_INSTALL_CACHE%/}
remove_config $LOCAL_CONFIG "INSTALL_CACHE"
@@ -78,10 +78,10 @@ set_install_root_menu() {
debug "libcrossinstall" "set_install_root_menu - is starting..."
local PROMPT="Please enter the install root location where you want file
installed"
- if NEW_INSTALL_ROOT=`eval $DIALOG ' --ok-label "Commit" \
+ if NEW_INSTALL_ROOT=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$INSTALL_ROOT"'`
+ 0 0 "$INSTALL_ROOT"')
then
INSTALL_ROOT=${NEW_INSTALL_ROOT%/}
remove_config $LOCAL_CONFIG "INSTALL_ROOT"
@@ -98,10 +98,10 @@ set_state_root_menu() {
debug "libcrossinstall" "set_state_root_menu - is starting..."
local PROMPT="Please enter location where you want state files to be"
- if NEW_STATE_ROOT=`eval $DIALOG ' --ok-label "Commit" \
+ if NEW_STATE_ROOT=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$STATE_ROOT"'`
+ 0 0 "$STATE_ROOT"')
then
STATE_ROOT=${NEW_STATE_ROOT%/}
remove_config $LOCAL_CONFIG "STATE_ROOT"
@@ -118,10 +118,10 @@ set_track_root_menu() {
debug "libcrossinstall" "set_track_root_menu - is starting..."
local PROMPT="Please enter the location where you want files tracked
relative to"
- if NEW_TRACK_ROOT=`eval $DIALOG ' --ok-label "Commit" \
+ if NEW_TRACK_ROOT=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$TRACK_ROOT"'`
+ 0 0 "$TRACK_ROOT"')
then
TRACK_ROOT=${NEW_TRACK_ROOT%/}
modify_config $LOCAL_ROOTS_CONFIG "TRACK_ROOT" "$TRACK_ROOT"
@@ -148,7 +148,7 @@ replicate_sorcery() {
bzip2 -cdf $SOURCE |
tar --owner=root --group=root -xf /dev/stdin &&
cd $SOURCE_DIRECTORY &&
- echo `pwd` &&
+ pwd &&
./install $INSTALL_ROOT
rc=$?
cd ..
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index d31af79..1c9c40f 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -456,7 +456,7 @@ private_run_depends()
lock_commit_transaction "$ABANDONED_PERSIST/$SPELL.p"
fi
prepare_spell_config
- SCRIPT_DIRECTORY=`codex_find_spell_by_name $SPELL`
+ SCRIPT_DIRECTORY=$(codex_find_spell_by_name $SPELL)
run_prepare $SPELL &&
run_details &&
run_configure $SPELL &&
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index dbece13..f1a199c 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -76,7 +76,7 @@ reap_modified_file() {
message "${MESSAGE_COLOR}was previously modified by SA?"
case $PRESERVE in
on) message "Therefore, it was not reaped." ;;
- off) SAVE="$1.`date -u +%Y%m%d`"
+ off) SAVE="$1.$(date -u +%Y%m%d)"
mv $1 $SAVE
message "Therefore, it was moved to"
message "${FILE_COLOR}${SAVE}" ;;
@@ -177,10 +177,10 @@ reaper() {
reap_regular_files
fi
- [ -f $REAPER_SYMS ] && rm -f `cat $REAPER_SYMS` 2>/dev/null
- [ -f $REAPER_SPECIAL ] && rm -f `cat $REAPER_SPECIAL` 2>/dev/null
- [ -f $REAPER_DIRS ] && rmdir `sort -r $REAPER_DIRS` 2>/dev/null
- [ -f $REAPER_FILES ] && rmdir `get_dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null
+ [ -f $REAPER_SYMS ] && rm -f $(cat $REAPER_SYMS) 2>/dev/null
+ [ -f $REAPER_SPECIAL ] && rm -f $(cat $REAPER_SPECIAL) 2>/dev/null
+ [ -f $REAPER_DIRS ] && rmdir $(sort -r $REAPER_DIRS) 2>/dev/null
+ [ -f $REAPER_FILES ] && rmdir $(get_dirnames < $REAPER_FILES |uniq|sort
-r) 2>/dev/null
rm -f $REAPER_FILES $REAPER_DIRS $REAPER_SYMS $REAPER_SPECIAL
}
@@ -220,9 +220,9 @@ reap_state_files() {
cat $REAPER_FILES | xargs rm
fi
- [ -f $REAPER_SYMS ] && rm -f `cat $REAPER_SYMS` 2>/dev/null
- [ -f $REAPER_DIRS ] && rmdir `sort -r $REAPER_DIRS` 2>/dev/null
- [ -f $REAPER_FILES ] && rmdir `get_dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null
+ [ -f $REAPER_SYMS ] && rm -f $(cat $REAPER_SYMS) 2>/dev/null
+ [ -f $REAPER_DIRS ] && rmdir $(sort -r $REAPER_DIRS) 2>/dev/null
+ [ -f $REAPER_FILES ] && rmdir $(get_dirnames < $REAPER_FILES |uniq|sort
-r) 2>/dev/null
rm -f $REAPER_FILES $REAPER_DIRS $REAPER_SYMS
@@ -273,9 +273,9 @@ load_spell() {
if tablet_set_spell $SPELL ; then
load_functions_file
else
- SCRIPT_DIRECTORY="`codex_find_spell_by_name $SPELL`"
+ SCRIPT_DIRECTORY="$(codex_find_spell_by_name $SPELL)"
- VERSION=`private_installed_version $SPELL`
+ VERSION=$(private_installed_version $SPELL)
INST_LOG=$INSTALL_LOGS/$SPELL-$VERSION
MD5_LOG=$MD5SUM_LOGS/$SPELL-$VERSION
if [[ $SCRIPT_DIRECTORY ]] ; then
@@ -401,18 +401,18 @@ dispel_depends_menu_template() {
local DEFAULT=$3
local always ask_yes ask_no ignore rc
dispel_depends_value_to_items $DEFAULT
- RESULT=`eval $DIALOG ' --title "$TITLE" \
+ RESULT=$(eval $DIALOG ' --title "$TITLE" \
--radiolist \
"" \
0 0 0 \
always "" $always \
ask-yes "" $ask_yes \
ask-no "" $ask_no \
- ignore "" $ignore'`
+ ignore "" $ignore')
rc=$?
if [[ $rc == 0 ]] ; then
# remove spurious ""
- RESULT=`echo "${RESULT}" | sed -e 's/^"//' -e 's/"$//'`
+ RESULT=$(echo "${RESULT}" | sed -e 's/^"//' -e 's/"$//')
modify_local_config $DEFAULT_NAME "$RESULT"
eval "$DEFAULT_NAME=\"$RESULT\""
fi
diff --git a/var/lib/sorcery/modules/libdownload
b/var/lib/sorcery/modules/libdownload
index 6ef9394..b4b4f07 100755
--- a/var/lib/sorcery/modules/libdownload
+++ b/var/lib/sorcery/modules/libdownload
@@ -48,7 +48,7 @@
#-------------------------------------------------------------------------
if ! [[ $DL_HANDLER_FILES ]] ; then
- DL_HANDLER_FILES=`ls $SGL_LIBRARY_MODULES/dl_handlers/dl_*[^~]`
+ DL_HANDLER_FILES=$(ls $SGL_LIBRARY_MODULES/dl_handlers/dl_*[^~])
for dl_handler_file in $DL_HANDLER_FILES; do
[ -x $dl_handler_file ] && . $dl_handler_file
done
diff --git a/var/lib/sorcery/modules/libhash b/var/lib/sorcery/modules/libhash
index 811ac83..d3d7774 100755
--- a/var/lib/sorcery/modules/libhash
+++ b/var/lib/sorcery/modules/libhash
@@ -98,7 +98,7 @@ hash_unbuild_field_name() {
local ___TABLE="$2"
local ___FIELD=${1#$___TABLE}
___FIELD=${___FIELD%_*}
-# `echo "$1" | sed -n "s/^$2\(.*\)_$/\1/p"`
+# $(echo "$1" | sed -n "s/^$2\(.*\)_$/\1/p")
# debug "libhash" "hash_unbuild_field_name() -
TABLE=$___TABLE:FIELD=$___FIELD"
diff --git a/var/lib/sorcery/modules/libinitd
b/var/lib/sorcery/modules/libinitd
index 530043d..6eb7d36 100755
--- a/var/lib/sorcery/modules/libinitd
+++ b/var/lib/sorcery/modules/libinitd
@@ -1,3 +1,4 @@
+#!/bin/bash
#---------------------------------------------------------------------
##
## @Synopsis Functions for automatic init-script installation.
diff --git a/var/lib/sorcery/modules/libmedia
b/var/lib/sorcery/modules/libmedia
index fbd163f..7ba78db 100755
--- a/var/lib/sorcery/modules/libmedia
+++ b/var/lib/sorcery/modules/libmedia
@@ -98,7 +98,7 @@ sound_schemes_menu() {
STA_SOUND="Startrek sound scheme"
OFF_SOUND="Sound off"
- if SOUND_CHECKS=`eval $DIALOG ' --title "Sound Schemes" \
+ if SOUND_CHECKS=$(eval $DIALOG ' --title "Sound Schemes" \
--cancel-label "Exit" \
--ok-label "Select" \
--item-help \
@@ -109,7 +109,7 @@ sound_schemes_menu() {
"FER" "$FER_SOUND" "$SOUND_HELP" \
"MIS" "$MIS_SOUND" "$SOUND_HELP" \
"SIM" "$SIM_SOUND" "$SOUND_HELP" \
- "STA" "$STA_SOUND" "$SOUND_HELP"'`
+ "STA" "$STA_SOUND" "$SOUND_HELP"')
then
for CHECK in $SOUND_CHECKS; do
@@ -171,7 +171,7 @@ color_schemes_menu() {
local D_HELP="Dark color scheme for use on bright backgrounds"
local B_HELP="blueish color scheme"
- COMMAND=`eval $DIALOG ' --title "Current scheme: $COLOR_SCHEME" \
+ COMMAND=$(eval $DIALOG ' --title "Current scheme: $COLOR_SCHEME" \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -180,7 +180,7 @@ color_schemes_menu() {
0 0 0 \
"L" "Light" "$L_HELP" \
"D" "Dark" "$D_HELP" \
- "B" "Blueish" "$B_HELP" '`
+ "B" "Blueish" "$B_HELP" ')
then
case $COMMAND in
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 3b7334a..572a2d8 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -732,11 +732,11 @@ real_list_remove() {
local i
for i in $@; do
- eval "$var=\`echo \" \$$var \" | sed \
+ eval "$var=\$(echo \" \$$var \" | sed \
-e \"s/[\t\v\f\r ]\\+/ /g\" \
-e \"s/ $i / /g\" \
-e \"s/^ *//\" \
- -e \"s/ *$//\"\`"
+ -e \"s/ *$//\"\)"
done
}
@@ -762,7 +762,7 @@ real_list_add() {
}
iterate list_add_sub " " "$(eval "echo \$$var")"
if [ $found -eq 0 ]; then
- eval "$var=\`echo \"\$$var $i\"\`"
+ eval "$var=\$(echo \"\$$var $i\"\)"
eval "$var=\"\${$var/# /}\""
fi
done
diff --git a/var/lib/sorcery/modules/libsecurity
b/var/lib/sorcery/modules/libsecurity
index 0430252..e267114 100755
--- a/var/lib/sorcery/modules/libsecurity
+++ b/var/lib/sorcery/modules/libsecurity
@@ -74,16 +74,16 @@ gaze_checkmd5() {
then
if ! filename_indicates_compression "$SOURCE_CACHE/$SOURCE"
then
- fMD5=`cat $SOURCE_CACHE/$SOURCE 2> /dev/null | md5sum | cut -d' '
-f1 | head -n 1`
+ fMD5=$(cat $SOURCE_CACHE/$SOURCE 2> /dev/null | md5sum | cut -d' '
-f1 | head -n 1)
else
fMD5=$(
- uncompress $SOURCE_CACHE/$SOURCE `
- guess_compressor $SOURCE_CACHE/$SOURCE` |
+ uncompress $SOURCE_CACHE/$SOURCE $(
+ guess_compressor $SOURCE_CACHE/$SOURCE) |
md5sum | cut -d' ' -f1
)
fi
else
- fMD5="`grep " $SOURCE\$" $PRECACHEDF | grep -Ev '\.[0-9]{14}$' | grep
-v '\.asc$' | cut -d' ' -f1 | head -n 1`"
+ fMD5="$(grep " $SOURCE\$" $PRECACHEDF | grep -Ev '\.[0-9]{14}$' | grep
-v '\.asc$' | cut -d' ' -f1 | head -n 1)"
fi
if [ -n "$REALSOURCE" ]
then
@@ -119,9 +119,9 @@ gaze_checkmd5() {
else
if test -z "$PRECACHEDB"
then
- bMD5="`md5sum $SOURCE_CACHE/$SOURCE | cut -d' ' -f1` | head -n
1"
+ bMD5="$(md5sum $SOURCE_CACHE/$SOURCE | cut -d' ' -f1) | head
-n 1"
else
- bMD5="`grep " $SOURCE\$" $PRECACHEDB | grep -Ev '\.[0-9]{14}$'
| grep -v '\.asc$'`"
+ bMD5="$(grep " $SOURCE\$" $PRECACHEDB | grep -Ev
'\.[0-9]{14}$' | grep -v '\.asc$')"
fi
if test "$tMD5" == "$bMD5"
then
@@ -132,13 +132,13 @@ gaze_checkmd5() {
elif test "$tMD5" == "gpg"
then
echo -en "${RED}${BOLD}GPGCHECK $SRCDATA"
- elif test -n "`echo $tMD5 | grep 'gpg$'`"
+ elif test -n "$(echo $tMD5 | grep 'gpg$')"
then
echo -en "${RED}${BOLD}GPG-SIGN $SRCDATA"
- elif test -n "$PRECACHEDB" && test -n "`grep $tMD5 $PRECACHEDF`"
+ elif test -n "$PRECACHEDB" && test -n "$(grep $tMD5 $PRECACHEDF)"
then
- MATCHED="`grep "$tMD5" "$PRECACHEDF" | cut -c60- | head -n 1`"
- if test -n "`echo "$MATCHED" | fgrep "$SOURCE"`"
+ MATCHED="$(grep "$tMD5" "$PRECACHEDF" | cut -c60- | head -n 1)"
+ if test -n "$(echo "$MATCHED" | fgrep "$SOURCE")"
then
echo -en "${RED}${BOLD}MODIFIED $SRCDATA EDIT
s/$tMD5/$fMD5/${DEFAULT_COLOR} MATCHES $MATCHED"
else
@@ -179,24 +179,24 @@ gaze_checkmd5syntax() {
echo -en "${YELLOW}${BOLD}"
if test -f $rp/PRE_BUILD ; then
#echo $rp $sn
- if test "`grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5`" = "" ;
then
+ if test "$(grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5)" = "" ;
then
if test "$sn" != "" ; then
echo -n "ADD unpack md5 arg to EXISTING PRE_BUILD"
else
- if test "`grep default_pre_build $rp/*`" = "" ; then
+ if test "$(grep default_pre_build $rp/*)" = "" ; then
echo -n "ADD unpack md5 arg to EXISTING PRE_BUILD"
fi
fi
fi
else
if test -f $rp/POST_INSTALL ; then
- if test "`grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5`" = "" ;
then
+ if test "$(grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5)" = ""
; then
if test "$sn" != "" ; then
echo -n "ADD unpack md5 arg to EXISTING POST_INSTALL or CREATED
PRE_BUILD"
fi
fi
elif test -f $rp/BUILD ; then
- if test "`grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5`" = "" ;
then
+ if test "$(grep unpack $rp/* | grep SOURCE$sn[^0-9] | grep MD5)" = ""
; then
if test "$sn" != "" ; then
echo -n "INIT unpack md5 arg or default_pre_build to NEW PRE_BUILD"
fi
@@ -226,7 +226,7 @@ gaze_checkmd5s() {
spellroot=$1
SCRIPT_DIRECTORY=$spellroot
spellpath=$spellroot/DETAILS
- spellname=`echo $spellroot | sed -e 's!/.*/!!'`
+ spellname=$(echo $spellroot | sed -e 's!/.*/!!')
unset FORCE_DOWNLOAD
unset SOURCE
unset MD5 2> /dev/null
@@ -277,7 +277,7 @@ gaze_md5check() {
source /etc/sorcery/config
- EMPTYMD5="`echo -n | md5sum | cut -d' ' -f1`"
+ EMPTYMD5="$(echo -n | md5sum | cut -d' ' -f1)"
#if CACHED is defined, then use some caches for speedy checking.
if ! test -z "$CACHED" ; then
@@ -287,7 +287,7 @@ gaze_md5check() {
unset SECTIONS SPELLS UNKNOWN
- [ -z "$1" ] && SECTIONS=`codex_get_all_sections`
+ [ -z "$1" ] && SECTIONS=$(codex_get_all_sections)
for spell_or_section in $@; do
@@ -301,7 +301,7 @@ gaze_md5check() {
done
for i in $SECTIONS ; do
- SPELLS="$SPELLS `codex_get_spells_in_section $i`"
+ SPELLS="$SPELLS $(codex_get_spells_in_section $i)"
done
for i in $SPELLS ; do
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 0933912..6d2b76d 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -28,7 +28,7 @@ update_sorcery_scripts() {
#This section is to make sure that all sorcery dependencies are cast
#Keep this outer if until basesystem is in the grimoires properly.
#(2002/10/13)
- if [[ `codex_find_spell_by_name basesystem` ]] ; then
+ if [[ $(codex_find_spell_by_name basesystem) ]] ; then
if ! spell_ok basesystem ; then
cast basesystem
fi &&
@@ -79,7 +79,7 @@ update_sorcery_scripts() {
tar --owner=root --group=root -xf /dev/stdin &&
cd $SOURCE_DIRECTORY &&
- echo `pwd` || return 1
+ pwd || return 1
# last chance to lock
message -n "${MESSAGE_COLOR}Waiting for${DEFAULT_COLOR}
${SPELL_COLOR}all${DEFAULT_COLOR}" \
@@ -107,7 +107,7 @@ update_sorcery_scripts() {
cd / &&
unlock_resources "libgrimoire" "install" &&
- SORCERY_VERSION=`cat /etc/sorcery/version`
+ SORCERY_VERSION=$(cat /etc/sorcery/version)
unlock_resources "solo" "cast"
unlock_resources "cast" "sorcery"
@@ -139,10 +139,10 @@ set_nice() {
PROMPT="Please enter the process priority sorcery should run at."
- if NICE=`eval $DIALOG ' --ok-label "Commit" \
+ if NICE=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$NICE"'`
+ 0 0 "$NICE"')
then
modify_local_config "NICE" "$NICE"
fi
@@ -159,10 +159,10 @@ set_umask() {
PROMPT="Please enter the permissions mask sorcery should run with."
- if UMASK=`eval $DIALOG ' --ok-label "Commit" \
+ if UMASK=$(eval $DIALOG ' --ok-label "Commit" \
--inputbox \
"$PROMPT" \
- 0 0 "$UMASK"'`
+ 0 0 "$UMASK"')
then
modify_local_config "UMASK" "$UMASK"
fi
@@ -257,7 +257,7 @@ save_libraries() {
lock_file "$SAVED"
rm -rf "$SAVED"
- OLD_VERSION=`installed_version $SPELL`
+ OLD_VERSION=$(installed_version $SPELL)
OLD_LOG=$INSTALL_LOGS/$SPELL-$OLD_VERSION
grep "^/lib/\|^/usr/lib" "$OLD_LOG" |
@@ -310,7 +310,7 @@ save_binaries() {
lock_file "$SAVED"
rm -rf "$SAVED"
- OLD_VERSION=`installed_version $SPELL`
+ OLD_VERSION=$(installed_version $SPELL)
OLD_LOG=$INSTALL_LOGS/$SPELL-$OLD_VERSION
grep "^/bin/\|^/sbin/\|^/usr/bin/\|^/usr/sbin/" "$OLD_LOG" |
@@ -688,7 +688,7 @@ grimoire_history() {
local grimoire="$1"
if [ -e $grimoire/ChangeLog ] ; then
local grimoirename="${grimoire##*/}"
- local date="`cat "$STATE_DIRECTORY/$grimoirename.lastupdate" 2>
/dev/null`"
+ local date="$(cat "$STATE_DIRECTORY/$grimoirename.lastupdate" 2>
/dev/null)"
[ -z "$date" ] && date="20030818"
local datedash=$(echo "$date" | sed 's,^\(....\)\(..\)\(..\)$,\1-\2-\3,')
get_new_changes "Viewing history since last update ($datedash) for
grimoire -- ${grimoirename} -- :" "$date" "$grimoire/ChangeLog"
@@ -706,9 +706,9 @@ grimoire_history() {
##
#---------------------------------------------------------------------
sorcery_history() {
- local date="`cat "$STATE_DIRECTORY/sorcery.lastupdate" 2> /dev/null`"
+ local date="$(cat "$STATE_DIRECTORY/sorcery.lastupdate" 2> /dev/null)"
[ -z "$date" ] && date="20030818"
- local datedash="`echo "$date" | sed 's,^\(....\)\(..\)\(..\)$,\1-\2-\3,'`"
+ local datedash="$(echo "$date" | sed 's,^\(....\)\(..\)\(..\)$,\1-\2-\3,')"
get_new_changes "Viewing history since last update ($datedash) for sorcery
:" "$date" /usr/share/doc/sorcery/ChangeLog
@@ -850,7 +850,7 @@ activity_log() {
run_details() {
debug "libsorcery" "starting run_details for $SPELL"
if ! codex_set_current_spell_by_name $SPELL; then
- local GRIMOIRES=`codex_get_all_grimoires`
+ local GRIMOIRES=$(codex_get_all_grimoires)
message "${PROBLEM_COLOR}Unable to find spell" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR}" \
"in grimoire(s): $GRIMOIRES ${DEFAULT_COLOR}"
@@ -878,7 +878,7 @@ unset_details() {
TEMP=${TEMP}${i}\\n
done
# not all SOURCE_* should be deleted (SOURCE_CACHE)
- VARS="$VARS `echo -e $TEMP | egrep "^SOURCE[0-9]*(_URL|_GPG|_IGNORE)?$"`"
+ VARS="$VARS $(echo -e $TEMP | egrep "^SOURCE[0-9]*(_URL|_GPG|_IGNORE)?$")"
unset $VARS
}
@@ -1144,7 +1144,7 @@ set_compression_type() {
while
- COMMAND=`eval $DIALOG ' --title "Currently using : $COMPRESSBIN " \
+ COMMAND=$(eval $DIALOG ' --title "Currently using : $COMPRESSBIN " \
--item-help \
--ok-label "Select" \
--cancel-label "Exit" \
@@ -1155,7 +1155,7 @@ set_compression_type() {
"P" "pbzip2 compression (parallel bzip2)"
"$P_HELP" \
"X" "xz compression" "$X_HELP" \
"G" "gzip compression" "$G_HELP" \
- "T" "no compression/tar" "$T_HELP"'`
+ "T" "no compression/tar" "$T_HELP"')
do
ARCHIVEBIN="tar"
diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index ae2c4d4..7b42d19 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -655,7 +655,7 @@ add_spell_status()
version=$3
fi
[[ $spell ]] && [[ $action ]] && [[ $version ]] || return 1
- date=`date +%Y%m%d`
+ date=$(date +%Y%m%d)
lock_start_transaction "$SPELL_STATUS" tSPELL_STATUS
echo "$spell:$date:$action:$version" >> $tSPELL_STATUS
lock_commit_transaction $SPELL_STATUS
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 9f5d4d4..6ddf2e2 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -73,7 +73,7 @@ run_castfs_sanity()
(
(echo stuff > foo) &&
(ls foo > /dev/null 2>&1) &&
- (test "stuff" = "`cat foo`") &&
+ (test "stuff" = "$(cat foo)") &&
rm -f foo
)
local rc=$?
diff --git a/var/lib/sorcery/modules/libtriggers
b/var/lib/sorcery/modules/libtriggers
index 6f475a1..08d1a1d 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -61,7 +61,7 @@ trigger()
[ -f $TRIGGER_LIST ] || return 0
# no locking of $TRIGGER_LIST since the triggered actions may need it
- iterate do_trigger $'\n' "`grep "^[^:]*:$spell:on_$action" $TRIGGER_LIST`"
+ iterate do_trigger $'\n' "$(grep "^[^:]*:$spell:on_$action" $TRIGGER_LIST)"
}
#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/liburl b/var/lib/sorcery/modules/liburl
index e3c250a..39d4c39 100755
--- a/var/lib/sorcery/modules/liburl
+++ b/var/lib/sorcery/modules/liburl
@@ -81,10 +81,10 @@
#
# (2002/09/29) added if so it only loads the stuff once
if ! [[ $URL_HANDLER_FILES ]] ; then
- URL_HANDLER_FILES=`ls $SGL_LIBRARY_MODULES/url_handlers/url_*[^~]`
+ URL_HANDLER_FILES=$(ls $SGL_LIBRARY_MODULES/url_handlers/url_*[^~])
for url_handler_file in $URL_HANDLER_FILES; do
[ -x $url_handler_file ] &&
- URL_PREFIX=`echo $url_handler_file | sed "s/.*\/url_//"` &&
+ URL_PREFIX=$(echo $url_handler_file | sed "s/.*\/url_//") &&
URL_TYPES[${#URL_TYPES[@]}]=$URL_PREFIX &&
. $url_handler_file
done
diff --git a/var/lib/sorcery/modules/url_handlers/url_cvs
b/var/lib/sorcery/modules/url_handlers/url_cvs
index 5cd0b9c..7d144b0 100755
--- a/var/lib/sorcery/modules/url_handlers/url_cvs
+++ b/var/lib/sorcery/modules/url_handlers/url_cvs
@@ -82,11 +82,11 @@
#---------------------------------------------------------------------
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`
- local CVS_TAGNAME=`echo $CVS_MODULE_TAG | cut -d : -f3`
+ 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)
+ 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_dir
b/var/lib/sorcery/modules/url_handlers/url_dir
index 5d699e8..226a0c5 100755
--- a/var/lib/sorcery/modules/url_handlers/url_dir
+++ b/var/lib/sorcery/modules/url_handlers/url_dir
@@ -44,7 +44,7 @@
#---------------------------------------------------------------------
url_dir_verify() {
- DIRNAME=`url_dir_crack $1`
+ DIRNAME=$(url_dir_crack $1)
if [ -n "$DIRNAME" ]; then
[ -d "$DIRNAME" ]
fi
diff --git a/var/lib/sorcery/modules/url_handlers/url_file
b/var/lib/sorcery/modules/url_handlers/url_file
index 94fd747..ed9a7e0 100755
--- a/var/lib/sorcery/modules/url_handlers/url_file
+++ b/var/lib/sorcery/modules/url_handlers/url_file
@@ -22,7 +22,7 @@
##
#---------------------------------------------------------------------
url_file_verify() {
- FILENAME=`url_file_strip_prefix $1`
+ FILENAME=$(url_file_strip_prefix $1)
if [[ "$FILENAME" ]] ; then
[ -f "$FILENAME" ] &&
[ -r "$FILENAME" ]
diff --git a/var/lib/sorcery/modules/url_handlers/url_http
b/var/lib/sorcery/modules/url_handlers/url_http
index 5450b0b..afbe3d7 100755
--- a/var/lib/sorcery/modules/url_handlers/url_http
+++ b/var/lib/sorcery/modules/url_handlers/url_http
@@ -53,7 +53,7 @@ url_http_verify() {
fi
if [ -n "$URL" ]; then
- if OUTPUT=`wget --passive-ftp -t 1 -T 30 --spider $check_certificate
"$URL" 2>&1`; then
+ if OUTPUT=$(wget --passive-ftp -t 1 -T 30 --spider $check_certificate
"$URL" 2>&1); then
true
else
echo $OUTPUT
@@ -96,7 +96,7 @@ url_ftp_verify() {
local DIRECTORY
smgl_basename $URL FILENAME
smgl_dirname $URL DIRECTORY
- local OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider -S
"$DIRECTORY/" 2>&1`
+ local OUTPUT=$(wget --passive-ftp -t 1 -T 30 -O - --spider -S
"$DIRECTORY/" 2>&1)
if real_list_find "$OUTPUT" "$FILENAME"; then
rm -f .listing
diff --git a/var/lib/sorcery/modules/url_handlers/url_smgl_tla
b/var/lib/sorcery/modules/url_handlers/url_smgl_tla
index fa26b55..c8f40b1 100755
--- a/var/lib/sorcery/modules/url_handlers/url_smgl_tla
+++ b/var/lib/sorcery/modules/url_handlers/url_smgl_tla
@@ -65,10 +65,10 @@ url_smgl_tla_bucketize() {
#
-----------------------------------------------------------------------------
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`
- TLA_REVISION=`echo $URL|cut -d"%" -f3`
+ URL=$(url_strip_prefix "$1" smgl_tla)
+ TLA_LOCATION=$(echo $URL|cut -d"%" -f1)
+ TLA_ARCHIVE=$(echo $URL|cut -d"%" -f2)
+ TLA_REVISION=$(echo $URL|cut -d"%" -f3)
}
diff --git a/var/lib/sorcery/modules/url_handlers/url_svn
b/var/lib/sorcery/modules/url_handlers/url_svn
index 480646f..d9d3c51 100755
--- a/var/lib/sorcery/modules/url_handlers/url_svn
+++ b/var/lib/sorcery/modules/url_handlers/url_svn
@@ -64,16 +64,16 @@
#---------------------------------------------------------------------
url_svn_crack() {
- URL=`url_strip_prefix "$1" svn`
- SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ URL=$(url_strip_prefix "$1" svn)
+ SVN_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
if list_find "$2" old_svn_compat; then
SVN_ROOT=http://$SVN_ROOT
else
SVN_ROOT=svn://$SVN_ROOT
fi
- local SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
- SVN_MODULE=`echo $SVN_MODULE_TAG | cut -d : -f2`
- local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
+ local SVN_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+ 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 24a196b..e9b0b55 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_http
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_http
@@ -61,11 +61,11 @@ url_svn_http_bucketize() {
#---------------------------------------------------------------------
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`
- local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
+ 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)
+ 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 364376b..34298db 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_https
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_https
@@ -61,11 +61,11 @@ url_svn_https_bucketize() {
#---------------------------------------------------------------------
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`
- local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
+ 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)
+ 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 b1b6aa3..1acb6ce 100644
--- a/var/lib/sorcery/modules/url_handlers/url_svn_ssh
+++ b/var/lib/sorcery/modules/url_handlers/url_svn_ssh
@@ -57,11 +57,11 @@ url_svn_ssh_bucketize() {
#---------------------------------------------------------------------
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`
- local SVN_TAGNAME=`echo $SVN_MODULE_TAG | cut -d : -f3`
+ 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)
+ local SVN_TAGNAME=$(echo $SVN_MODULE_TAG | cut -d : -f3)
SVN_TAG=${SVN_TAGNAME:=HEAD}
}
- [SM-Commit] GIT changes to master sorcery by Ismael Luceno (a3db552bb4df62887bc9d386ef3d88a054441bc3), Ismael Luceno, 02/07/2019
Archive powered by MHonArc 2.6.24.