X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/5167ae018f03fc46747c28bb2662805d59bf62bc..7b24c22c6a79cff42759f93e091f6e553ffeade6:/pic-mv?ds=sidebyside

diff --git a/pic-mv b/pic-mv
index 195b959..23da8c3 100755
--- a/pic-mv
+++ b/pic-mv
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-destdir=/some/path  # Optional: Fill this in here.
+destdir=
+if [[ -e .default-pic-mv-destdir ]];then
+  destdir=$( < .default-pic-mv-destdir )
+fi
 
 exposure=
 rotate=
@@ -13,6 +16,11 @@ while getopts d:e:r: opt;do
 done
 shift `expr $OPTIND - 1`
 
+if [[ -z "$destdir" ]];then
+  echo "Please specify a destdir with -d or .default-pic-mv-destdir" >&2
+  exit 1
+fi
+
 file="$1"
 name="$2"
 
@@ -28,6 +36,7 @@ out="$destdir/$name $number.jpeg"
 
 if [[ "$file" == *.NEF ]];then
   base="${file%.NEF}"
+  NEFout="$destdir/$name $number.NEF"
   if [[ "$rotate" ]];then
     numeric_exposure=$(dc <<< "2k $exposure 4 / 3.5-p")
     pics-run-ufraw "$numeric_exposure" "$file" "$out" "$rotate"
@@ -35,10 +44,12 @@ if [[ "$file" == *.NEF ]];then
     mv -vi "$exposure/$base.jpeg" "$out"
   fi
   touch -r "$file" "$out"
-  mv -vi "$file" "$destdir/$name $number.NEF"
+  mv -vi "$file" "$NEFout"
+  chmod 644 "$NEFout"
 else
   if [[ "$rotate" ]];then
-    sed -i "s/^# ROBOTS_INSERT_THINGS_HERE\$/&\n\"$name $number.jpeg\" => $rotate," "$destdir/rotations.php"
+    sed -i "s/^# ROBOTS_INSERT_THINGS_HERE\$/\"$name $number.jpeg\" => $rotate,\n&/" "$destdir/rotations.php"
   fi
   mv -vi "$file" "$out"
 fi
+chmod 644 "$out"