[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (5c8100c806f8f8d8a8df21fa19003b5464cc07bd)

David Brown scm at mail.sourcemage.org
Tue Oct 31 16:29:54 EST 2006


GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 at gmail.com>:

 usr/sbin/confmeld |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c8100c806f8f8d8a8df21fa19003b5464cc07bd
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    confmeld fixed the removal of the config stage directory in the file name so it will work all the time

diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 10138f5..530594e 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -72,7 +72,7 @@ function parse_stage_config_path()
 {
   local file=$1
   local __tmp __spell __sdate __path
-  __tmp=${file/$CONFIG_STAGE_DIRECTORY\//}
+  __tmp=$(echo $file | sed "s#^$CONFIG_STAGE_DIRECTORY/##")
   __spell=$(echo $__tmp | cut -d/ -f1)
   __sdate=$(echo $__tmp | cut -d/ -f2)
   __path=$(echo $__tmp | cut -d/ -f3-)



More information about the SM-Commit mailing list