Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (798f5a25ecff05519ae5e562d276f7e3382dcac0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (798f5a25ecff05519ae5e562d276f7e3382dcac0)
  • Date: Sun, 20 Apr 2008 08:07:49 -0500

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

ChangeLog | 7 +++++++
usr/sbin/cleanse | 2 +-
usr/sbin/gaze | 24 ++++++++++++------------
usr/sbin/scribbler | 2 +-
usr/sbin/scribe | 15 ++++++++-------
usr/sbin/sorcery | 6 +++---
var/lib/sorcery/build/run_compiler | 4 ++--
var/lib/sorcery/modules/build_api/common | 2 +-
var/lib/sorcery/modules/libcast | 14 +++++++++-----
var/lib/sorcery/modules/libcodex | 4 ++--
var/lib/sorcery/modules/libgpg | 11 +++++++----
var/lib/sorcery/modules/libgrimoire | 2 +-
var/lib/sorcery/modules/libmisc | 2 +-
var/lib/sorcery/modules/libresurrect | 8 ++++----
var/lib/sorcery/modules/libsorcery | 21 +++++++--------------
var/lib/sorcery/modules/libstage | 16 ++++++++--------
var/lib/sorcery/modules/libstate | 8 ++++----
var/lib/sorcery/modules/libtablet | 3 ++-
var/lib/sorcery/modules/url_handlers/url_http | 6 ++++--
19 files changed, 84 insertions(+), 73 deletions(-)

New commits:
commit 798f5a25ecff05519ae5e562d276f7e3382dcac0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

run_compiler: use the normal dirname and basename, since it doesn't have
the full sorcery environment

commit 3998e2c9dae1ecfd94263e53d78acddb6402a763
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libsorcery: simplified a loop in save_binaries

commit 90267337deafc2dcc357f33a2a383954b284c2fe
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fixed broken symlink handling in save_libraries

*: use smgl versions of basename and dirname

diff --git a/ChangeLog b/ChangeLog
index 6729c50..1db3510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
+2008-04-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: simplified a loop in save_binaries
+ * run_compiler: use the normal dirname and basename, since it doesn't
have
+ the full sorcery environment
+
2008-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery: sanitized the saving of CCACHE in the feature_menu
fixed CCACHE and STORE_CONF_LOG not being disablable
rewrote feature_menu to be much more concise and removed the extra
variable fallbacks, since most are already in the sorcery config
improved printing of the grimoire changelog
+ fixed broken symlink handling in save_libraries
* config: added defaults for COLOR, CONFIG_LOC and GATHER_DOCS
* scribe: fixed case in scribe update message
+ * *: use smgl versions of basename and dirname

2008-04-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: don't clear the line on every queuing progress bar
update
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index e71d297..ee9b9a7 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -968,7 +968,7 @@ function cleanse_fix_md5sum_check() {
# make the assumption that spell versions dont contain
dashes...
# this actually isnt a very good assumption but works enough
# of the time
- each_spell=$(basename $each|awk -F- '{for (i=1;i<NF-1;i++)
{printf "%s-",$i}printf "%s\n",$i}')
+ each_spell=$(smgl_basename $each|awk -F- '{for
(i=1;i<NF-1;i++) {printf "%s-",$i}printf "%s\n",$i}')
each_version=$(private_installed_version $each_spell)
[[ $each_version ]] &&
[[ $MD5SUM_LOGS/${each_spell}-${each_version} == $each ]] &&
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index d581902..d4e3bb6 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -300,7 +300,7 @@ function gaze_catalog() {
[[ $GAZE_VERBOSE != 0 ]] && echo "Sorcery Grimoire for `date -u`"

if [ $grimoire ]; then
- echo "Grimoire: " $(basename $grimoire)
+ echo "Grimoire: " $(smgl_basename $grimoire)
else
echo "Grimoires: " $(codex_get_all_grimoires | get_basenames)
fi
@@ -311,14 +311,14 @@ function gaze_catalog() {
if [[ $GAZE_VERBOSE != 0 ]]; then
echo
echo "-------------------------------------------------"
- echo "SECTION: $( basename $SECTION )"
+ echo "SECTION: $( smgl_basename $SECTION )"
echo "-------------------------------------------------"
else
echo
- echo "SECTION: $( basename $SECTION )"
+ echo "SECTION: $( smgl_basename $SECTION )"
fi
for spell in `codex_get_spells_in_section $SECTION`; do
- echo `basename $spell` #keeps head from breaking pipes
+ smgl_basename $spell
(( COUNT++ ))
done
done
@@ -428,7 +428,7 @@ function gaze_catalog_html() {
echo "<h1>$(date -u)</h1>"

if [ $grimoire ]; then
- echo "<h1>Grimoire: " $(basename $grimoire)"</h1>"
+ echo "<h1>Grimoire: " $(smgl_basename $grimoire)"</h1>"
else
echo "<h1>Grimoires: " $(codex_get_all_grimoires |
get_basenames)"</h1>"
fi
@@ -449,7 +449,7 @@ function gaze_catalog_html() {
for SECTION in `codex_get_all_sections $grimoire`; do
echo "<tr>"
echo "<th colspan=\"${COLS}\">"
- echo "<h2>$( basename $SECTION )</h2>"
+ echo "<h2>$( smgl_basename $SECTION )</h2>"
echo "</th></tr>"
for SPELL in `codex_get_spells_in_section $SECTION`; do
(
@@ -726,7 +726,7 @@ function real_short_search() {
grep_find_grimoire $grimoire "DETAILS" "SHORT=.*${pattern}"
); do

- spellname=$(basename $(dirname $spell))
+ smgl_basename "$(smgl_dirname $spell)" spellname
if [[ $GAZE_VERBOSE == 0 ]]; then
echo $spellname
else
@@ -780,10 +780,10 @@ function real_long_search() {

if [[ ${SEARCH_RESULTS} ]]; then
if [[ $GAZE_VERBOSE == 0 ]]; then
- basename $(dirname $file)
+ smgl_basename $(smgl_dirname $file)
else
clear_line
- echo "$pattern -> $(basename $(dirname $file) ) ${SEARCH_RESULTS}"
+ echo "$pattern -> $(smgl_basename $(smgl_dirname $file) )
${SEARCH_RESULTS}"
fi
fi
done
@@ -1156,7 +1156,7 @@ function gaze_show_versions() {
fi

else
- echo "$(basename $GRIMOIRE)|-|-|-|-"
+ echo "$(smgl_basename $GRIMOIRE)|-|-|-|-"
fi
done

@@ -1212,7 +1212,7 @@ function gaze_show_patchlevels() {
fi

else
- echo "$(basename $GRIMOIRE)|-|-|-|-|-"
+ echo "$(smgl_basename $GRIMOIRE)|-|-|-|-|-"
fi
done

@@ -1852,7 +1852,7 @@ function gaze_system_info()
let idx=0
for grimoire in $(codex_get_all_grimoires)
do
- message "${QUERY_COLOR} [$idx]: $(basename
"$grimoire"):${DEFAULT_COLOR}" \
+ message "${QUERY_COLOR} [$idx]: $(smgl_basename
"$grimoire"):${DEFAULT_COLOR}" \
"${MESSAGE_COLOR}$grimoire${DEFAULT_COLOR}"
let idx+=1
done
diff --git a/usr/sbin/scribbler b/usr/sbin/scribbler
index 130ef5c..bebfc62 100755
--- a/usr/sbin/scribbler
+++ b/usr/sbin/scribbler
@@ -40,7 +40,7 @@ EOF
function scribbler_remove() {
rm -rfv $SPELL_DIRECTORY
# remove empty sections
- rmdir $(dirname $SPELL_DIRECTORY)
+ rmdir $(smgl_dirname $SPELL_DIRECTORY)
scribe reindex $3
}

diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index b615b41..08a21ae 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -213,8 +213,9 @@ function scribe_add_update_worker() {
fi
fi

- local grim_dir=$(dirname $grimoire)
- local grim_name=$(basename $grimoire)
+ local grim_dir grim_name grim_target
+ smgl_dirname "$grimoire" grim_dir
+ smgl_basename "$grimoire" grim_name
pushd $grim_dir &> /dev/null

# get the url, if one was specified sanity check it
@@ -224,7 +225,7 @@ function scribe_add_update_worker() {
error_message "Error: $from is not a recognized url. Using the
default."
from=""
else
- grim_target=$(basename $from)
+ smgl_basename "$from" grim_target
fi
fi

@@ -277,9 +278,9 @@ function scribe_add_update_worker() {
local rc
if [[ "$scribe_type" == file ]] ; then

- gpg_verify_grimoire $PWD/$scribe_target $(dirname $from)
+ gpg_verify_grimoire $PWD/$scribe_target $(smgl_dirname $from)
rc=$?
- gpg_user_query $rc $(basename $from) grimoire || return 1
+ gpg_user_query $rc $(smgl_basename $from) grimoire || return 1

[[ $add_or_update == update ]] && mv $grim_name temp_$grim_name.old

@@ -378,7 +379,7 @@ function scribe_fix_metadata() {
error_message "Grimoire $1 not found, this may be a sorcery bug..."
return 1
fi
- grimoire_name=$(basename $1)
+ smgl_basename "$1" grimoire_name

if query "Repair Grimoire:$1's Metadata?" n || [ "$2" == "1" ] ; then
message "Enter url to pull grimoire from"
@@ -696,7 +697,7 @@ function scribe_update() {
else
#for each grimoire
for grimoire in $(codex_get_all_grimoires); do
- grim=$(basename $grimoire)
+ smgl_basename "$grimoire" grim
if ! [ -e $grimoire/GRIMOIRE ] && ! scribe_fix_metadata $grimoire; then
#no metadata found. dont auto-update
error_message "$grim has invalid metadata. Not Updating!"
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 8f933a9..9aa00e1 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -182,7 +182,7 @@ show_spells() { (

for SPELL in $SPELLS; do

- SPELLNAME=$( basename $SPELL )
+ smgl_basename $SPELL $SPELLNAME
if ! spell_installed $SPELLNAME &&
! spell_held $SPELLNAME &&
! spell_exiled $SPELLNAME
@@ -553,7 +553,7 @@ process_section() {

for SPELL in $SPELLS; do

- LINE=$( basename $SPELL )
+ smgl_basename "$SPELL" LINE
if echo -e "$KEEP_LIST" |
grep -q "^$LINE\$"
then push_install_queue $LINE
@@ -732,7 +732,7 @@ architecture_menu() {
# ones found later
for SPECFILE in $(find $ARCH_SPECS -not -name '*~'|tac); do
if test -x "$SPECFILE" && grep -q "CPUNAME" $SPECFILE; then
- specname=$(basename $SPECFILE)
+ smgl_basename "$SPECFILE" specname
hash_put archspec_hash $specname $SPECFILE
fi
done
diff --git a/var/lib/sorcery/build/run_compiler
b/var/lib/sorcery/build/run_compiler
index 700f4d3..8cfe154 100644
--- a/var/lib/sorcery/build/run_compiler
+++ b/var/lib/sorcery/build/run_compiler
@@ -43,8 +43,8 @@ else
CCACHE=""
fi

-COMPILER=$( basename $0 )
-MYDIR=$( dirname $0 )
+COMPILER=$(basename $0)
+MYDIR=$(dirname $0)

# Remove this directory from $PATH - we don't want to re-exec this script!
export PATH=${PATH/$MYDIR/}
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index ca5c56b..e0e355d 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -322,7 +322,7 @@ function run_spell_success() {

[[ -d $spell_config_stage/current ]] &&
mv $spell_config_stage/current \
- $spell_config_stage/$(basename $tablet_dir)
+ $spell_config_stage/$(smgl_basename $tablet_dir)
fi
fi
unlock_file "$spell_config_stage"
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 63cacb3..35e2a5f 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -202,10 +202,13 @@ function query_services() {
local new_init_inst new_init_ninst new_init_enab new_init_disab
local new_xinetd_inst new_xinetd_ninst new_xinetd_enab new_xinetd_disab

+ local xtmp_base itmp_base
for xtmp in $XINETD_SCRIPTS; do
+ smgl_basename $xtmp xtmp_base
for itmp in $INIT_SCRIPTS; do
- if [[ $(basename $xtmp) == $(basename $itmp) ]] ; then
- list_add BOTH $(basename $itmp)
+ smgl_basename $itmp itmp_base
+ if [[ $xtmp_base == $itmp_base ]] ; then
+ list_add BOTH $itmp_base
found=1
break
fi
@@ -213,7 +216,7 @@ function query_services() {
done

for tmp in $INIT_SCRIPTS; do
- tmp=$(basename $tmp)
+ smgl_basename "$tmp" tmp
list_find $tmp $BOTH || list_add INIT $tmp
# if the script is ESSENTIAL or RECOMMENDED default to yes unless
# the user previously said no
@@ -227,7 +230,7 @@ function query_services() {
done

for tmp in $XINETD_SCRIPTS; do
- tmp=$(basename $tmp)
+ smgl_basename "$tmp" tmp
list_find $tmp $BOTH || list_add XINETD $tmp
done

@@ -513,7 +516,8 @@ function install_xinetd() {
#---------------------------------------------------------------------
function install_xinetd_sub() {
local file=$1
- local bfile=$(basename $1)
+ local bfile
+ smgl_basename "$1" bfile
local state=$2
local install_dir=$3
local tmp_file=$TMP_DIR/$bfile
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index 36840f6..051231e 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -786,7 +786,7 @@ function find_providers() {
for provider in $providers; do
if ! spell_exiled $provider; then
spell_path=$(codex_find_spell_by_name $provider)
- GRIMOIRE=$(dirname $( dirname $spell_path))
+ smgl_dirname "$(smgl_dirname $spell_path)" GRIMOIRE
# ensure the first place we look for the spell is a provider
grep -q "^$feature $spell_path$" $GRIMOIRE/$PROVIDE_INDEX_FILE &&
echo $provider
@@ -933,7 +933,7 @@ function codex_list_provides () {
grimoire=$1

for file in $(codex_find_in_grimoire $grimoire "PROVIDES"); do
- spell=$(dirname $file)
+ smgl_dirname "$file" spell
for provides in $(gawk '{if (/provides/) { print $2 }
else { print $1 }}' $file); do
echo "$provides $spell"
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index af13920..5a7877c 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -51,7 +51,7 @@ function gpg_verify_signature() { # $1 sig $2 file $3
pubring $4 algo var
"should be done for you on a system update.${DEFAULT_COLOR}"
return 200
else
- local output=$TMP_DIR/$(basename $file).gpgout
+ local output=$TMP_DIR/$(smgl_basename $file).gpgout
gpg --no-default-keyring \
--always-trust \
--keyring $keyring \
@@ -128,7 +128,8 @@ function gpg_verify_grimoire() {
local BRANCH=$3
local SIGNATURE=$4

- local SOURCE=$(basename $FILENAME)
+ local SOURCE
+ smgl_basename "$FILENAME" SOURCE

if [[ -z $BRANCH ]]; then
# deduce the name of the branch from the tarball (stable-rc-0.19.tar.bg2)
@@ -254,7 +255,8 @@ function gpg_verify_common() {
local KEYRING=$3
local REASON=$4
local SIGNATURE=$5
- local SOURCE=$(basename $FILENAME)
+ local SOURCE
+ smgl_basename "$FILENAME" SOURCE

local SIG_FILE=${SOURCE}.${GPG_SIG_EXT}
pushd $TMP_DIR &>/dev/null ||
@@ -363,7 +365,8 @@ function verify_against_manifest() {
local manifest=$2
local algorithm=$3
local ignore=$4
- local base=$(basename $dir)
+ local base
+ smgl_basename "$dir" base
local real_list=$TMP_DIR/$base
local missing=$TMP_DIR/missing.$base
local rc=0
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 4efb3e8..85332c5 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -172,7 +172,7 @@ function install_desktop_files() {

mkdir -p $target_dir
for each in $(find $desktop_dir -maxdepth 1 -type f); do
- file=$(basename $each)
+ smgl_basename "$each" file
if ! test -f "$target_dir/$file" ; then
debug "libgrimoire" "Installing $file in $target_dir as a desktop file"
cp $each $target_dir
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index d8a9e98..a261a54 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1115,7 +1115,7 @@ function remove_files_and_dirs() {
cat $1|get_dirnames|while read dir; do
until [[ $dir == ${2:-/} ]] ; do
rmdir $dir &>/dev/null || break
- dir=$(dirname $dir)
+ smgl_dirname "$dir" dir
done
done
}
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 5eaa844..23c7249 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -439,7 +439,7 @@ function internal_install_config_file() {
# if its a symlink, just copy, someday maybe we should figure
# out where it points to and so something, but thats too annoying
if test -h "$from" ; then
- mkdir -p "$(dirname "$to")" &&
+ mkdir -p "$(smgl_dirname "$to")" &&
cp -pv --no-dereference "$from" "$to"
return $?
fi
@@ -447,7 +447,7 @@ function internal_install_config_file() {
# if the file does not exist, or stage root is invoked
if ! test -e "$to" || [[ $STAGED_INSTALL == on ]] ; then
# copy the new one in (plus leading directories)
- mkdir -p "$(dirname "$to")" &&
+ mkdir -p "$(smgl_dirname "$to")" &&
cp -pv "$from" "$to"

# to get here the file must exist
@@ -476,7 +476,7 @@ function internal_install_config_file() {
real_handle_changed_config "$from" "$to" $savetime
else
# replace the file
- mkdir -p "$(dirname "$to")" &&
+ mkdir -p "$(smgl_dirname "$to")" &&
cp -pv "$from" "$to"
fi
fi
@@ -558,7 +558,7 @@ function resurrect_success() {
# 14) copy compile log
# this file is not regenerated unlike its friends install and md5sum
local OLD_COMPILE_LOG=$(find .${COMPILE_LOGS#$INSTALL_ROOT}/ -maxdepth 1
-type f|head -n 1)
- local COMPILE_LOG="$COMPILE_LOGS/$(basename "$OLD_COMPILE_LOG")"
+ local COMPILE_LOG="$COMPILE_LOGS/$(smgl_basename "$OLD_COMPILE_LOG")"
# also relative to STATE_ROOT
cp "$OLD_COMPILE_LOG" "$COMPILE_LOG"

diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 2633666..ee246f0 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -277,16 +277,12 @@ function save_libraries() {
grep -q "shared object"
then
if [ -h $LINE ]; then
- DEST=$( basename $( ls -la "$LINE" |
- cut -d '>' -f2 |
- cut -c 2-
- )
- )
- ln -sf $DEST $OLD_LIBS/`basename $LINE`
+ local DEST=$(readlink "$LINE")
+ ln -sf "$DEST" $OLD_LIBS/$(smgl_basename "$LINE")
else
cp $LINE $OLD_LIBS
fi
- echo $OLD_LIBS/`basename $LINE` >> $SAVED
+ echo $OLD_LIBS/$(smgl_basename "$LINE") >> $SAVED
fi


@@ -336,10 +332,10 @@ function save_binaries() {
then
if [ -h $LINE ]; then
DEST=$( readlink "$LINE" )
- mkdir -p $( dirname $OLD_BINS/$LINE )
+ mkdir -p $( smgl_dirname $OLD_BINS/$LINE )
ln -sf $DEST $OLD_BINS/$LINE
else
- mkdir -p $( dirname $OLD_BINS/$LINE )
+ mkdir -p $( smgl_dirname $OLD_BINS/$LINE )
cp $LINE $OLD_BINS/$LINE
fi
echo $OLD_BINS/$LINE >> $SAVED
@@ -350,12 +346,9 @@ function save_binaries() {

unlock_file $SAVED

- for dir in $( find $OLD_BINS )
+ for dir in $(find $OLD_BINS -type d)
do
- if [[ -d $dir ]]
- then
- export PATH=$( envar_prepend_path "$dir" "$PATH" )
- fi
+ export PATH=$(envar_prepend_path "$dir" "$PATH")
done
}

diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index cadfa98..0322599 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -75,11 +75,11 @@ function stage_install_directory()
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/${DIR}")
local OWNER=$(stat -c %U "${STAGE_DIRECTORY}/TRANSL/${DIR}")
local GROUP=$(stat -c %G "${STAGE_DIRECTORY}/TRANSL/${DIR}")
- if [[ ! -d $(dirname "${INSTALL_ROOT}/$DIR") ]]
+ if [[ ! -d $(smgl_dirname "${INSTALL_ROOT}/$DIR") ]]
then
# this shouldn't happen but just in case
- message "${PROBLEM_COLOR}Ah, not preserving permissions making $(dirname
$DIR)${DEFAULT_COLOR}" &&
- mkdir -p $(dirname "${INSTALL_ROOT}/$DIR")
+ message "${PROBLEM_COLOR}Ah, not preserving permissions making
$(smgl_dirname $DIR)${DEFAULT_COLOR}" &&
+ mkdir -p $(smgl_dirname "${INSTALL_ROOT}/$DIR")
fi &&
message "${FILE_COLOR}$PERMISSION $OWNER:$GROUP $DIR${DEFAULT_COLOR}" &&
if [[ -d "${INSTALL_ROOT}/$DIR" ]]
@@ -106,7 +106,7 @@ function stage_install_file()
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
message "${MESSAGE_COLOR}Staging config to
$CONFIG_STAGE_DIRECTORY${DEFAULT_COLOR}"
- mkdir -p "$(dirname $SAVE)" &&
+ mkdir -p "$(smgl_dirname $SAVE)" &&
cp -dp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$SAVE"
else
cp -dp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
@@ -129,7 +129,7 @@ function stage_install_symlink()
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
- mkdir -p $(dirname $SAVE) &&
+ mkdir -p $(smgl_dirname $SAVE) &&
ln -sfn "$LINK" "${INSTALL_ROOT}/$SAVE"
else
ln -sfn "$LINK" "${INSTALL_ROOT}/$FILE"
@@ -154,7 +154,7 @@ function stage_install_fifo()
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
- mkdir -p $(dirname $SAVE) &&
+ mkdir -p $(smgl_dirname $SAVE) &&
mkfifo "${INSTALL_ROOT}/$SAVE" &&
chmod $PERMISSION "${INSTALL_ROOT}/$SAVE" &&
chown $OWNER:$GROUP "${INSTALL_ROOT}/$SAVE"
@@ -188,7 +188,7 @@ function stage_install_char_block()
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
- mkdir -p $(dirname $SAVE) &&
+ mkdir -p $(smgl_dirname $SAVE) &&
mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$SAVE" "${TYPE}"
"${MAJOR}" "${MINOR}" &&
chown $OWNER:$GROUP "${INSTALL_ROOT}/$SAVE"
else
@@ -230,7 +230,7 @@ function stage_install_list()
stage_install_directory "$@"
else
message "${PROBLEM_COLOR}Oh, God I don't know what to do..."
- message "${FILE_COLOR}$(dirname ${1})${PROBLEM_COLOR}"
+ message "${FILE_COLOR}$(smgl_dirname ${1})${PROBLEM_COLOR}"
message "is some other kind of a file and not a
directory${DEFAULT_COLOR}"
fi
}
diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index a973591..7151567 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -1041,12 +1041,12 @@ function modify_config() {
else separator="=" ; fi

if ! test -f $FILE; then
- if ! test -d $(dirname $FILE); then
- if test -e $(dirname $FILE); then
- message "Trying to modify $FILE, but $(dirname $FILE) is not a
directory"
+ if ! test -d $(smgl_dirname $FILE); then
+ if test -e $(smgl_dirname $FILE); then
+ message "Trying to modify $FILE, but $(smgl_dirname $FILE) is not a
directory"
return 1
fi
- mkdir -p $(dirname $FILE)
+ mkdir -p $(smgl_dirname $FILE)
fi &&
touch $FILE || {
message "Failed to create $FILE"
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 3c56de4..d334bb8 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -759,7 +759,8 @@ function tablet_cleanse_chapter() {
local sdir=$1
local backup_dir=$2
local do_repair=$3
- local spell=$(basename $sdir)
+ local spell
+ smgl_basename "$sdir" spell
local page rc

mkdir -p "$backup_dir/duplicates"
diff --git a/var/lib/sorcery/modules/url_handlers/url_http
b/var/lib/sorcery/modules/url_handlers/url_http
index 589180c..f48b0da 100755
--- a/var/lib/sorcery/modules/url_handlers/url_http
+++ b/var/lib/sorcery/modules/url_handlers/url_http
@@ -92,8 +92,10 @@ function url_ftp_verify() {
local URL=$1

if [ -n "$URL" ]; then
- local FILENAME=`basename $URL`
- local DIRECTORY=`dirname $URL`
+ local FILENAME
+ 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`

if real_list_find "$OUTPUT" "$FILENAME"; then



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (798f5a25ecff05519ae5e562d276f7e3382dcac0), Jaka Kranjc, 04/20/2008

Archive powered by MHonArc 2.6.24.

Top of Page