Index: branches/fc15-dev/locker/bin/cronload
===================================================================
--- branches/fc15-dev/locker/bin/cronload	(revision 1878)
+++ branches/fc15-dev/locker/bin/cronload	(revision 1938)
@@ -1,3 +1,17 @@
 #!/bin/sh
+
+usage="Usage \"$0 [-l lockername] [-h] crontab\""
+while getopts "l:h" options; do
+    case $options in 
+        l ) lname=$OPTARG;;
+        h ) echo "$usage"; exit 0;;
+        * ) 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 +20,22 @@
 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
+if ! grep -q "^MAILTO=" "$1"; then
+    echo "WARNING: You have no MAILTO= variable set. This means any"
+    echo "cron errors will go to $lname@scripts.mit.edu (your mail_scripts"
+    echo "account), which is almost certainly not what you want!"
+    echo "Please add a MAILTO= line, e.g., MAILTO=${EMAIL:-${ATHENA_USER:-$USER}@mit.edu},"
+    echo "to your crontab. If you do not want to receive errors, set"
+    echo 'MAILTO="".'
+fi
Index: branches/fc15-dev/locker/bin/crontab
===================================================================
--- branches/fc15-dev/locker/bin/crontab	(revision 1878)
+++ branches/fc15-dev/locker/bin/crontab	(revision 1938)
@@ -9,5 +9,5 @@
 # (can be useful for debugging)
 # You can always redirect the output of individual commands to /dev/null
-MAILTO="SCRIPTS_USER@mit.edu"
+MAILTO="ATHENA_USER@mit.edu"
 # If you do not want to receive any mail from cron, use the line below instead
 #MAILTO=""
@@ -22,5 +22,5 @@
 #  | | | | |
 #  | | | | ----- day of week (0 - 6) (Sunday=0)
-#  | |  | ------- month (1 - 12)
+#  | | | ------- month (1 - 12)
 #  | | --------- day of month (1 - 31)
 #  | ----------- hour (0 - 23)
Index: branches/fc15-dev/locker/bin/for-each-server
===================================================================
--- branches/fc15-dev/locker/bin/for-each-server	(revision 1878)
+++ branches/fc15-dev/locker/bin/for-each-server	(revision 1938)
@@ -1,14 +1,5 @@
 #!/bin/sh
 
-case `machtype` in
-    linux|darwin)
-        TAIL_ARG="-n"
-	;;
-    *)
-        TAIL_ARG=""
-	;;
-esac
-
-for server in `finger @scripts.mit.edu | tail ${TAIL_ARG} +5 | sed -n "s/  -> \([^:]*\):.*/\1/p" | sort -u`; do
+for server in `finger @scripts.mit.edu | sed -n -e "1,5d" -e "s/  -> \([^:]*\):.*/\1/p" | sort -u`; do
     ssh "$server" "$@"
 done
Index: branches/fc15-dev/locker/bin/scripts-advancedbook
===================================================================
--- branches/fc15-dev/locker/bin/scripts-advancedbook	(revision 1878)
+++ 	(revision )
@@ -1,6 +1,0 @@
-#!/bin/sh
-
-sname="Advanced Guestbook"
-deploy="advancedbook"
-prompt_username=1
-. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-advancedpoll
===================================================================
--- branches/fc15-dev/locker/bin/scripts-advancedpoll	(revision 1878)
+++ 	(revision )
@@ -1,10 +1,0 @@
-#!/bin/sh
-
-# This automatic installer is no longer advertised.
-# Here is our old description of it:
-# * "Advanced Poll":http://proxy2.de/scripts.php ~["demo":http://proxy2.de/poll/]~ - polling software featuring multiple polls, templates, unlimited options, multi-language support, IP-Logging, IP-Locking, cookie support, comment feature, vote expire feature, and random poll support.
-
-sname="Advanced Poll"
-deploy="advancedpoll"
-prompt_username=1
-. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-e107
===================================================================
--- branches/fc15-dev/locker/bin/scripts-e107	(revision 1878)
+++ 	(revision )
@@ -1,6 +1,0 @@
-#!/bin/sh
-
-sname="e107"
-deploy="e107"
-prompt_username=1
-. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-git
===================================================================
--- branches/fc15-dev/locker/bin/scripts-git	(revision 1938)
+++ branches/fc15-dev/locker/bin/scripts-git	(revision 1938)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+sname="git repository"
+deploy="git"
+create_scripts_dir=1
+requires_sql=0
+prompt_username=1
+prompt_password=0
+. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-mediawiki
===================================================================
--- branches/fc15-dev/locker/bin/scripts-mediawiki	(revision 1878)
+++ branches/fc15-dev/locker/bin/scripts-mediawiki	(revision 1938)
@@ -2,6 +2,6 @@
 
 sname="MediaWiki"
-deploy="mediawiki$scriptsstar"
+deploy="mediawiki"
 prompt_username=1
 wizard="mediawiki"
-. /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
+. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-phpical
===================================================================
--- branches/fc15-dev/locker/bin/scripts-phpical	(revision 1878)
+++ 	(revision )
@@ -1,6 +1,0 @@
-#!/bin/sh
-
-sname="PHP iCalendar"
-deploy="phpical"
-requires_sql=0
-. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/scripts-ssh
===================================================================
--- branches/fc15-dev/locker/bin/scripts-ssh	(revision 1878)
+++ branches/fc15-dev/locker/bin/scripts-ssh	(revision 1938)
@@ -9,5 +9,5 @@
 	-o PreferredAuthentications=gssapi-with-mic \
 	-o ForwardX11=no \
-	-o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
+	-o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
 	-o UserKnownHostsFile=/dev/null \
 	-t \
Index: branches/fc15-dev/locker/bin/scripts-start
===================================================================
--- branches/fc15-dev/locker/bin/scripts-start	(revision 1878)
+++ branches/fc15-dev/locker/bin/scripts-start	(revision 1938)
@@ -6,7 +6,7 @@
     echo 'gallery2 Gallery2'
     echo 'phpbb phpBB'
-    echo 'phpical PHP iCalendar'
+    echo 'joomla Joomla'
+    echo 'git Git repository'
     echo 'trac Trac'
-    echo 'joomla Joomla'
     echo 'turbogears TurboGears'
     echo 'django Django'
Index: branches/fc15-dev/locker/bin/scripts-wordpress
===================================================================
--- branches/fc15-dev/locker/bin/scripts-wordpress	(revision 1878)
+++ branches/fc15-dev/locker/bin/scripts-wordpress	(revision 1938)
@@ -2,6 +2,6 @@
 
 sname="WordPress"
-deploy="wordpress$scriptsstar"
+deploy="wordpress"
 prompt_password=0
 wizard="wordpress"
-. /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
+. /mit/scripts/deploy$scriptsdev/bin/onathena
Index: branches/fc15-dev/locker/bin/signup-cron
===================================================================
--- branches/fc15-dev/locker/bin/signup-cron	(revision 1878)
+++ branches/fc15-dev/locker/bin/signup-cron	(revision 1938)
@@ -10,5 +10,9 @@
   fs sa /mit/$lname/cron_scripts daemon.scripts write
   DATE=`date`
-  sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/deploy/crontab | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
+  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
+  sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/bin$scriptsdev/crontab | sed '/ATHENA_USER/s//'"$signupuser"'/g' | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
+  echo "By default, output from cron jobs for the $lname locker will be mailed"
+  echo "to $signupuser@mit.edu.  You should edit /mit/$lname/cron_scripts/crontab"
+  echo "to change this and set up your cron jobs."
   success "the cron script service" "The directory /mit/$lname/cron_scripts has been created."
 else
Index: branches/fc15-dev/locker/bin/signup-mail
===================================================================
--- branches/fc15-dev/locker/bin/signup-mail	(revision 1878)
+++ branches/fc15-dev/locker/bin/signup-mail	(revision 1938)
@@ -9,5 +9,5 @@
   fs sa /mit/$lname/mail_scripts system:authuser none
   fs sa /mit/$lname/mail_scripts daemon.scripts read
-  signupuser=`echo "$principal" | sed 's/@.*$//'`
+  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
   sed /SCRIPTS_USER/s//$signupuser/ /mit/scripts/bin/procmailrc > /mit/$lname/mail_scripts/procmailrc
   echo "By default, mail sent to $lname@scripts.mit.edu will be forwarded to"
Index: branches/fc15-dev/locker/bin/ssh
===================================================================
--- branches/fc15-dev/locker/bin/ssh	(revision 1878)
+++ branches/fc15-dev/locker/bin/ssh	(revision 1938)
@@ -11,5 +11,5 @@
 	-o PreferredAuthentications=gssapi-with-mic \
 	-o ForwardX11=no \
-	-o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
+	-o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
 	-o UserKnownHostsFile=/dev/null \
 	"$@"