From: "David Brown <dmlb2000 AT gmail.com> David Brown" <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com> David Brown (a9323f0ef33388d2a4f16e09f2564ee55c479fd7)
Date: Tue, 13 Jun 2006 19:16:52 -0500
GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>
David Brown <dmlb2000 AT gmail.com>:
New commits:
commit a9323f0ef33388d2a4f16e09f2564ee55c479fd7
Merge: 108ae4e... 2062bee...
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
resolved conflicts with andrews fix
commit 108ae4efe085ffe8e1c1d46924a434a75703ac30
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
removed lots of the && that were causing parse errors
commit ed87c0e1a24b19c2a79af097703112c6b5eeddfb
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
added quotes everywhere fixed cd'ing to home instead of install root by
adding / and removed the rm's during staging because it's not needed and
calling rm in random places could cause problems
commit 042cbc750952e570c0692a56acad0fc1754e2346
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
if removing source dir fails don't fail to remove the stage directory
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 3bf696e..c62ab43 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -111,7 +111,7 @@ function run_pre_build() {
rm_source_dir
mkdir -p $BUILD_DIRECTORY
- cd $BUILD_DIRECTORY
+ cd "$BUILD_DIRECTORY"
if [ -d "$SOURCE_DIRECTORY" ] ; then
- cd $SOURCE_DIRECTORY
+ cd "$SOURCE_DIRECTORY"
else
- cd $BUILD_DIRECTORY
+ cd "$BUILD_DIRECTORY"
fi &&
invoke_build_dir
@@ -182,9 +182,9 @@ function run_pre_install() {
if [ -f $S_PWD ] ; then
cd "`cat $S_PWD`"
elif [ -d $SOURCE_DIRECTORY ] ; then
- cd $SOURCE_DIRECTORY
+ cd "$SOURCE_DIRECTORY"
else
- cd $BUILD_DIRECTORY
+ cd "$BUILD_DIRECTORY"
fi
persistent_load &&
@@ -214,9 +214,9 @@ function run_install() {
if [ -f $S_PWD ] ; then
cd "`cat $S_PWD`"
elif [ -d $SOURCE_DIRECTORY ] ; then
- cd $SOURCE_DIRECTORY
+ cd "$SOURCE_DIRECTORY"
else
- cd $BUILD_DIRECTORY
+ cd "$BUILD_DIRECTORY"
fi
persistent_load &&
@@ -253,7 +253,7 @@ function run_post_install() {
persistent_load &&
if [[ $STAGED_INSTALL != off ]]
then
- cd $STAGE_DIRECTORY/TRANSL
+ cd "$STAGE_DIRECTORY/TRANSL"
else
cd "${INSTALL_ROOT:-/}"
fi &&
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index d67e390..65fea44 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -340,7 +340,7 @@ function run_spell_failure() {
if [[ $CLEAN_SOURCE == on ]]
then
- rm_source_dir &&
+ rm_source_dir
if [[ $STAGED_INSTALL != off ]]
then
destroy_stage_root
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index d861980..15971c2 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -62,7 +62,7 @@ function stage_install_files()
local file
while read file ; do
[ "$file" ] || continue
- stage_install_list $file $1
+ stage_install_list "$file" "$1"
done
}
@@ -70,19 +70,19 @@ function stage_install_directory()
{
local DIR=$1
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/${DIR}")
- if [[ ! -d $(dirname ${INSTALL_ROOT}/$DIR) ]]
+ if [[ ! -d $(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)
+ mkdir -p $(dirname "${INSTALL_ROOT}/$DIR")
fi &&
- message "${FILE_COLOR}$PERMISSION $DIR${DEFAULT_COLOR}"
- if [[ -d $DIR ]]
+ message "${FILE_COLOR}$PERMISSION $DIR${DEFAULT_COLOR}" &&
+ if [[ -d "$DIR" ]]
then
- chmod $PERMISSION ${INSTALL_ROOT}/$DIR
+ chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR"
else
- mkdir $DIR &&
- chmod $PERMISSION ${INSTALL_ROOT}/$DIR
+ mkdir "$DIR" &&
+ chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR"
fi
}
[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com> David Brown (a9323f0ef33388d2a4f16e09f2564ee55c479fd7),
David Brown <dmlb2000 AT gmail.com> David Brown, 06/13/2006