Changeset 520

Timestamp:

06/17/2011 16:25:47 (11 months ago)

Author:

joshu

Message:

confman now checks whether the directory that contains a file to be imported exists and, if it does not, recursively creates the containing directories. Fixes #132.

Location:

trunk

Files:

• abspath.in (modified) (1 diff)
• confman.in (modified) (2 diffs)

trunk/abspath.in

@@ -38 +38 @@
     dir=`cd $file >/dev/null; echo \$PWD`
     echo "$dir"
-  else
+    return 0
+  elif [ -d $(dirname $file) ]; then
     dir=`cd $(dirname $file) >/dev/null ; echo \$PWD`
     echo "$dir/$(basename "$file")"
+    return 0
+  else
+    return 1
   fi
 }

trunk/confman.in

@@ -388 +388 @@
         # If we can't enter the parent directory, this will help us
         # get the info we need.
-        if ! $SUDO [ -e $1 ]; then
-            echo "No such file or directory: $1" >&2
-            return 1
-        else
-            file=`$SUDO $ABSPATH $1`
+        file=`$SUDO $ABSPATH $1`
+        if [ $? -eq 1 ]; then
+            filename="$(basename $1)"
+            real_path="$(dirname $1)"
+            imaginary_path=""
+            while ! [ -d $real_path ]; do
+                imaginary_path="/${real_path##*/}$imaginary_path"
+                real_path="${real_path%/*}"
+            done
+            file="$($SUDO $ABSPATH $real_path)$imaginary_path/$filename"
         fi
     fi
@@ -487 +492 @@
         return
     else
+        # If some of the directories containing the file don't exist, we should
+        # prompt for the creation of those directories ...
+        if [ -z $imaginary_path ]; then
+            for directory in ${imaginary_path//\// }; do
+                d_owner=$owner
+                d_group=$group
+                d_mode=$mode
+                echo "${real_path}/${directory} does not exist; creating it."
+                # Prompt for directory owner
+                echo "Who should be the directory's owner? [ $d_owner ]"
+                read response
+                if [ ! -z $response ] ; then
+                    d_owner=$response
+                fi
+        
+                # And directory's group
+                echo "Who should be the directory's group? [ $d_group ]"
+                read response
+                if [ ! -z $response ] ; then
+                    d_group=$response
+                fi
+        
+                # now, the permissions
+                echo "What should the directory's permissions be? [ $d_mode ]"
+                read response
+                if [ ! -z $response ] ; then
+                    d_mode=$response
+                fi
+                real_path="$real_path/$directory"
+                conf_mkdir $real_path $d_owner $d_group $d_mode
+            done
+        fi
         # Prompt for file owner
         echo "Who should be the file's owner? [ $owner ]"