Changeset 326 for branches

Timestamp:

05/06/2009 13:15:58 (3 years ago)

Author:

ccowart

Message:

Merged path changes into 1.9 branch.

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (3 diffs)
• abspath (deleted)
• abspath.in (copied) (copied from trunk/abspath.in)
• confadmin.in (modified) (3 diffs)
• confaudit.in (modified) (1 diff)
• confexport.in (modified) (1 diff)
• conflock (deleted)
• conflock.in (copied) (copied from trunk/conflock.in)
• confman.in (modified) (3 diffs)
• confman_completion.in (modified) (1 diff)
• confmancommon.sh.in (modified) (1 diff)
• confmanlib.sh (deleted)
• confmanlib.sh.in (copied) (copied from trunk/confmanlib.sh.in)
• confsync.in (modified) (1 diff)

branches/confman-1.9/Makefile.am

@@ -47 +47 @@
                 -e 's,[@]sbindir[@],$(sbindir),g' \
                 -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-                -e 's,[@]sysconfdefaultsdir[@],$(sysconfdefaultsdir),g'
+                -e 's,[@]sysconfdefaultsdir[@],$(sysconfdefaultsdir),g' \
+                -e 's,[@]BASH[@],$(BASH),g' \
+                -e 's,[@]SUDO[@],$(SUDO),g' \
+                -e 's,[@]SVN[@],$(SVN),g'
 
 confman: confman.in Makefile
@@ -61 +64 @@
         chmod +x confexport
 
+conflock: conflock.in Makefile
+        $(do_subst) < conflock.in > conflock
+        chmod +x conflock
+
 confsync: confsync.in Makefile
         $(do_subst) < confsync.in > confsync
@@ -68 +75 @@
         $(do_subst) < confaudit.in > confaudit
         chmod +x confaudit
+
+abspath: abspath.in Makefile
+        $(do_subst) < abspath.in > abspath
+        chmod +x abspath
+
+confmanlib.sh: confmanlib.sh.in Makefile
+        $(do_subst) < confmanlib.sh.in > confmanlib.sh
 
 confmancommon.sh: confmancommon.sh.in Makefile

branches/confman-1.9/confadmin.in

@@ -1 @@
-#! /usr/bin/env bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors
@@ -52 +52 @@
     local dir dirs
     local msg="Initial confman directory setup." 
-    if svn ls "${REPO_URI}/trunk/checkpoints" >/dev/null 2>&1 ; then
+    if @SVN@ ls "${REPO_URI}/trunk/checkpoints" >/dev/null 2>&1 ; then
         echo "It looks like this repository has already been setup." >&2
         exit 1
@@ -59 +59 @@
         dirs="${dirs} ${REPO_URI}/${dir}"
     done
-    svn mkdir -m "$msg" ${dirs}
+    @SVN@ mkdir -m "$msg" ${dirs}
 }
 

branches/confman-1.9/confaudit.in

@@ -1 @@
-#! /usr/bin/env bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors

branches/confman-1.9/confexport.in

@@ -1 @@
-#! /usr/bin/env bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors

branches/confman-1.9/confman.in

@@ -1 @@
-#! /usr/bin/env bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors
@@ -131 +131 @@
         cat $LOG_TEMPLATE > $msg
         printf "\n${ignoreline}\n" >> $msg
-        conf_get_recipe | tr ' ' '\n' | xargs -I % svn status \
+        conf_get_recipe | tr ' ' '\n' | xargs -I % @SVN@ status \
             ${WORK_PATH}/% >> $status
                 cat $status >> $msg
@@ -199 +199 @@
             files="$files $file"
         done
-        svn status $files >> $status
+        @SVN@ status $files >> $status
         cat $status >> $msg
         cp $msg $orig_msg

branches/confman-1.9/confman_completion.in

@@ -1 @@
-#!/bin/bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors

branches/confman-1.9/confmancommon.sh.in

@@ -35 +35 @@
 TMPFILES=""
 if [ `id -u` != "0" ]; then
-    SUDO=sudo
+    SUDO="@SUDO@"
 fi
 

branches/confman-1.9/confsync.in

@@ -1 @@
-#! /usr/bin/env bash
+#!@BASH@
 #
 # Copyright (c) 2008, Christopher Cowart and contributors