Changeset 587

Timestamp:

12/23/2011 15:18:16 (5 months ago)

Author:

blee

Message:

Implement confman touch for creating versioned files in working copies.

See #154

Location:

trunk

Files:

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

trunk/confman.8.in

@@ -310 +310 @@
 directories do not have to exist; they will be created automatically. This
 command only affects your working copy. It does not commit the change.
+.It Cm touch Ar file
+Create a new version-controlled file in your working copy. Parent directories
+must exist. This command only affects your working copy. It does not commit the
+change.
 .It Cm revert Ar
 Restore the working copy files to the state before you began making edits.

trunk/confman.in

@@ -654 +654 @@
 }
 
+function cnf_touch {
+    local file="$1"
+
+    local owner="${DEFAULT_OWNER}"
+    local group="${DEFAULT_GROUP}"
+    local mode="${DEFAULT_MODE_FILE}"
+    local comment="${DEFAULT_COMMENT}"
+    local wcopy_lock
+    local livefile
+
+    if [ -z "${file}" ]; then
+        print_usage 1
+    fi
+    
+    wcopy_lock=$(conf_lock_wcopy)
+
+    # Resolve the absolute path to the file
+    file="$("${ABSPATH}" .)/${file}"
+
+    # If the filename doesn't begin with WORK_PATH, we can't operate here
+    if [ "${file#${WORK_PATH}}" = "${file}" ]; then
+        echo "Cannot operate on non-working-copy file: ${file}" >&4
+    fi
+
+    module=${file#${WORK_PATH}/}
+    module=${module%%/*}
+    livefile="/${file#${WORK_PATH}/*/}"
+
+    # If it exists on the live filesystem, pull the attributes from there
+    if [ -f "${livefile}" ]; then
+        eval `$SUDO ${stat_cmd} "${stat_opts}" "${livefile}"`
+
+        # TODO: Guess the comment character too
+
+        # Convert mode string to base 10:
+        mode=`echo "obase=10;ibase=8;${mode}" | bc`
+        # And use a bitmask to subtract off all write-access
+        # 3949d = 7555o
+        mode=$((${mode} & 3949))
+        # And back to an octet:
+        mode=`printf '%04o\n' ${mode}`
+
+        echo "Touching file ${livefile} with ${owner}:${group}, ${mode}, comment string ${comment}"
+        conf_gen_file "${module}" "${livefile}" "${owner}" "${group}" "${mode}" "${comment}" "" ""
+
+    # Otherwise, prompt for attributes
+    else
+        # Prompt for file owner
+        echo "Who should be the file's owner? [ ${owner} ]"
+        read response
+        if [ -n "${response}" ]; then
+            owner="${response}"
+        fi
+
+        # Prompt for file group
+        echo "Who should be the file's group? [ ${group} ]"
+        read response
+        if [ -n "${response}" ]; then
+            group="${response}"
+        fi
+
+        # Prompt for file mode
+        echo "What should the file's permissions be? [ ${mode} ]"
+        read response
+        if [ -n "${response}" ]; then
+            mode="${response}"
+        fi
+
+        # Prompt for file comment
+        echo "What string starts comment lines? [ ${comment} ]"
+        read response
+        if [ -n "${response}" ]; then
+            comment="${response}"
+        fi
+
+        echo "Touching file ${livefile} with ${owner}:${group}, ${mode}, comment string ${comment}"
+        conf_gen_file "${module}" "${livefile}" "${owner}" "${group}" "${mode}" "${comment}" "" ""
+    fi
+
+    conf_unlock_wcopy "${wcopy_lock}"
+}
+
 function list {
         local file item
@@ -1271 +1353 @@
     rmmod )                         rmmod "$@" ;;
     mkdir|mkd* )                    newdir "$@" ;;
+    touch )                         cnf_touch "$@" ;;
     list|ls )                       list "$@" ;;
     link|ln )                       mklink "$@" ;;

trunk/confmandoc.sh

@@ -58 +58 @@
   $MYNAME mv src_working_copy dest_working_copy
   $MYNAME mkdir workingdirectory
+  $MYNAME touch workingfile
   $MYNAME revert workingfile
   $MYNAME chown owner [ workingfile | workingdirectory ] 

trunk/confmanlib.sh.in

@@ -1034 +1034 @@
         echo $file
 
-        if [ -z $usefile ] ; then
+        if [ -z "${usefile}" ] ; then
                                         echo -e "${warning}\n${morewarn}\n${revision}\n" > $myfile
         elif head -n 1 ${usefile} | grep '^#!' >/dev/null ; then