Index: /branches/locker-dev/locker/bin/cronload
===================================================================
--- /branches/locker-dev/locker/bin/cronload	(revision 1562)
+++ /branches/locker-dev/locker/bin/cronload	(revision 1563)
@@ -1,3 +1,20 @@
 #!/bin/sh
+
+usage="Usage \"$0 [-l lockername] crontab\""
+while getopts "l:h" options; do
+    case $options in 
+        l ) lname=$OPTARG;;
+        h ) echo "$usage"; exit 0;;
+        \? ) echo "$usage"
+            exit 1;;
+        * ) echo "$usage"
+            exit 1;;
+    esac
+done
+shift `expr $OPTIND - 1`
+if [ -z "$1" ]; then
+    echo "$usage"
+    exit 1
+fi
 
 echo "This program should print your new crontab below."
@@ -6,5 +23,14 @@
 echo
 
+
 cwd=`pwd`
-lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
+if [ -z "$lname" ]; then
+    lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
+fi
+if [ -z "$lname" ]; then
+    echo "ERROR: Could not detect locker name. Make sure to run"
+    echo "cronload from within /mit/lockername/cron_scripts/"
+    echo "(or pass the -l lockername option)"
+    exit 1
+fi
 athrun scripts scripts-ssh "$lname" /usr/local/bin/cronload "$1" "$cwd" 2>/dev/null