Changeset 521

Timestamp:

08/02/2011 15:04:23 (10 months ago)

Author:

joshu

Message:

Reverting changes made for import failing on nonexistent directories; see #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"
-    return 0
-  elif [ -d $(dirname $file) ]; then
+  else
     dir=`cd $(dirname $file) >/dev/null ; echo \$PWD`
     echo "$dir/$(basename "$file")"
-    return 0
-  else
-    return 1
   fi
 }

trunk/confman.in

@@ -389 +389 @@
         # get the info we need.
         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
     shift
@@ -492 +482 @@
         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 ]"