Changeset 419

Timestamp:

09/21/2009 15:32:13 (3 years ago)

Author:

ccowart

Message:

The existing `confman ln' feature was buggy. This corrects a problem
where the target of symlinks was detected incorrectly.

See #51, where we are currently tracking testing and polishing for this
feature's inclusion in 2.0.

This commit will need to be merged to the 1.9 branch.

Thanks: Matthew Ekstrand-Abueg <mattea@…>

File:

• trunk/confmanlib.sh.in (modified) (2 diffs)

trunk/confmanlib.sh.in

@@ -500 +500 @@
     local link=$2
     local forced=$3
-    local opts isdir
-    local WD=`pwd`
+    local opts isdir linkdir
 
     if [ "$forced" == "true" ] ; then
@@ -520 +519 @@
     target=`${readlink_cmd} -m $target`
     target=${target/$ABS_WORK\//}
-    WD="${WD/$ABS_WORK\//}/"
     link=`${readlink_cmd} -m $link`
-
-    while [[ ${WD} =~ "^.+/" ]]; do
+    linkdir="${link/$ABS_WORK\//}/"
+
+    while [[ ${linkdir} =~ ^.+/ ]]; do
         target="../$target"
-        WD=${WD#*/}
+        linkdir=${linkdir#*/}
     done