Changeset 461

Timestamp:

10/07/2009 23:40:21 (3 years ago)

Author:

ccowart

Message:

Merging link fixes from trunk.

Fixes #51

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.8.in (modified) (2 diffs)
• confmanlib.sh.in (modified) (2 diffs)

branches/confman-1.9/confman.8.in

@@ -244 +244 @@
 .Ar destination . 
 Arguments must be working copies.
+.It Cm link [ Fl f ] Ar target link_name 
+The link command creates a symbolic link (See 
+.Xr ln 1) pointing to the 
+.Ar target 
+file or directory. If 
+.Ar link_name 
+is a 
+directory, the link will be created with the same 
+.Xr basename 1 as 
+.Ar target . 
+The most common use of repository symlinks is to reconcile path differences
+between operatings systems. You can create freebsd/usr/local/etc/sudoers as
+a normal file. You can then create the link linux/etc/sudoers to point
+to the former file (in the freebsd module). This allows you to have a
+single copy of the file in different locations for different modules.
 .It Cm mkdir Ar directory
 Create a new version-controlled directory in your working copy. Parent
@@ -362 +377 @@
 .Pp
 And our host-specific configurations in the marvin portion
-(www/etc/rc.conf-marvin):
+(marvin/etc/rc.conf-marvin):
 .Pp
 .Dl apache22_enable="YES"

branches/confman-1.9/confmanlib.sh.in

@@ -544 +544 @@
     local link=$2
     local forced=$3
-    local opts isdir
-    local WD=`pwd`
+    local opts isdir linkdir rtarget rlink
 
     if [ "$forced" == "true" ] ; then
@@ -554 +553 @@
     fi
 
-    if [ -d "$link" ]; then
-        isdir="true"
-        if [[ "$link" =~ /$ ]]; then
-            link=${link%\/}
-        fi
-    fi
-
-    ABS_WORK=`${readlink_cmd} -m $WORK_PATH`
+    if [ -d "$link" ] ; then
+        link="${link}/$(basename "${target}")"
+    fi
+
+    # target needs to be transformed to be relative to the link. In order
+    # to do this, we need to cannonicalize filenames relative to the
+    # working copy root
+
+    ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
     target=`${readlink_cmd} -m $target`
-    target=${target/$ABS_WORK\//}
-    WD="${WD/$ABS_WORK\//}/"
+    rtarget=${target#${ABS_WORK}/}
+
+    if [ "$target" = "$rtarget" ] ; then
+        echo "target $target does not appear to be in your working copy." >&4
+        return 1
+    fi
+
     link=`${readlink_cmd} -m $link`
-
-    while [[ ${WD} =~ "^.+/" ]]; do
-        target="../$target"
-        WD=${WD#*/}
+    rlink="${link#${ABS_WORK}/}"
+
+    if [ "$link" = "$rlink" ] ; then
+        echo "link $link does not appear to be in your working copy." >&4
+        return 1
+    fi
+
+    linkdir="${rlink%/*}/"
+
+    while [[ ${linkdir} =~ ^.+/ ]]; do
+        rtarget="../$rtarget"
+        linkdir=${linkdir#*/}
     done
 
-    if [ -n "$isdir" ] ; then
-        link="${link}/${target/*\//}"
-    fi
-
-    ln -s $opts "$target" "$link"
-    @SVN@ add "$link"
+    ln -s $opts "$rtarget" "${WORK_PATH}/$rlink"
+    @SVN@ add "${WORK_PATH}/$rlink"
 }