Changeset 1530

Timestamp:

Mar 29, 2010, 12:18:28 AM (14 years ago)

Author:

mitchb

Message:

Teach scripts-remove about locker.scripts.mit.edu URLs

scripts-start learned about the new-style URLs long ago.  Removals
of autoinstalls should prompt you to fill in the URL you actually
recognize your install as being at (and should attempt to unconfuse
you if your install is from the old era).  Also don't quit before
declaring success if a database was dropped as part of the process.

(Merge of r1221:1526 from branches/locker-dev to trunk, from adehnert)

File:

• trunk/locker/bin/scripts-remove (modified) (4 diffs, 1 prop)

trunk/locker/bin/scripts-remove

@@ -54 +54 @@
 echo 
 echo "When you installed the software, you chose a URL"
-echo "that starts with http://scripts.mit.edu/~$lname/."
-echo "Please enter the full URL where this software was"
-echo "installed.  (This should correspond to a directory"
-echo "in /mit/$lname/web_scripts/.)"
-printf "%s" "URL: http://scripts.mit.edu/~$lname/"
+echo "that starts with http://$lname.scripts.mit.edu/"
+echo "(for software installed after March 2009) or"
+echo "http://scripts.mit.edu/~$lname/ (for software"
+echo "installed before then)."
+echo "Please enter the new-style full URL where this"
+echo "software was installed.  (This should correspond"
+echo "to a directory in /mit/$lname/web_scripts/.)"
+printf "%s" "URL: http://$lname.scripts.mit.edu/"
 read addrend
 
@@ -65 +68 @@
     echo
     echo "ERROR:"
-    echo "You must enter one or more characters after ~$lname/"
+    echo "You must enter one or more characters after mit.edu/"
     echo "The completed address must only contain a-z, 0-9, and /."
     exit 1
@@ -146 +149 @@
             echo "available in /mit/sql/backup/$lname".
         fi
-        exit
     else
         echo "ERROR:"
@@ -157 +159 @@
 fi
 echo
-echo "The installation in http://scripts.mit.edu/~$lname/$addrend"
+echo "The installation in http://$lname.scripts.mit.edu/$addrend"
 echo "has been successfully uninstalled."