New commits:
commit 4a7914cac0d5137df0ecb8c823699babd2ac5cd9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libstage: read the link only once when transfering links and quote them
diff --git a/ChangeLog b/ChangeLog
index 4a15f1a..01bfcd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* cleanse: broken runtime providers don't need to be recast if
switched
don't display cast/dispel commands if none are needed and print a
newline between each menu
+ * libstage: read the link only once when transfering links and quote
them
2008-02-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmisc: fixed consolidate_params so it can take "-[eEn]" as values
too;
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 955fec0..cadfa98 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -122,16 +122,17 @@ function stage_install_symlink()
{
local FILE=$1
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
- message "${FILE_COLOR}Symlink $FILE -> $(readlink
"$STAGE_DIRECTORY/TRANSL/$FILE")${DEFAULT_COLOR}"
+ local LINK=$(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
+ message "${FILE_COLOR}Symlink $FILE -> $LINK${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
mkdir -p $(dirname $SAVE) &&
- ln -sfn $(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
"${INSTALL_ROOT}/$SAVE"
+ ln -sfn "$LINK" "${INSTALL_ROOT}/$SAVE"
else
- ln -sfn $(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
"${INSTALL_ROOT}/$FILE"
+ ln -sfn "$LINK" "${INSTALL_ROOT}/$FILE"
fi
;;
*)
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4a7914cac0d5137df0ecb8c823699babd2ac5cd9),
Jaka Kranjc, 03/03/2008