Add some more docs, minor updates.

Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>

diff --git a/TODO b/TODO
index e309fdb66b747a84fe4122c8aad95d1d26a9621a..f548c1178d0e703f3185a921b5f8e381c575fe83 100644 (file)
--- a/TODO
+++ b/TODO
@@ -29,7 +29,7 @@ The Git Autoinstaller
     X. Check for empty directories and add stub files as necessary
        (use preserve-empty-dir)
 
-    5. Commit your changes, and tag as v1.2.3-scripts1
+    5. Commit your changes, and tag as v1.2.3-scripts
 
     6. Run the "dry-run script", which uses Git commands to check how many
        working copies apply the change cleanly, and writes out a logfile
@@ -40,11 +40,21 @@ The Git Autoinstaller
 
     8. Run the "deploy" script, which applies the update to all working
        copies possible, and sends mail to users to whom the working copy
-       did not apply cleanly.
+       did not apply cleanly. (It also frobs .scripts/version)
 
     Note: The last three scripts will need to be implemented, with an
           eye towards speed.
 
+* How to migrate an old autoinstaller to the new autoinstaller
+
+    - Find the oldest tarball/patch set for the application that still
+      is in use and upgradable.
+
+    - Untar, apply patch, place in a directory and git init
+
+    - Create the .scripts directory and populate it with the interesting
+      information (see below)
+
 * The repository for a given application will contain the following files:
 
     - The actual application's files, as from the official tarball
@@ -56,7 +66,8 @@ The Git Autoinstaller
           be in any language.
 
         * .scripts/version which contains the version last autoinstalled
-          (as distinct from the actual version the script is)
+          (as distinct from the actual version the script is) (This will
+          be auto-generated and should not be versioned)
 
         * .scripts/real-version (+x) which checks the source code to find the
           actual version of the application
@@ -80,6 +91,8 @@ The Git Autoinstaller
 
     5. git reset
 
+    6. Setup .scripts/version (probably pipe the output of real-version)
+
 * We will not add special code to handle .htaccess; thus the kernel patch
   for allowing Apache access to .htaccess sent to scripts-team@mit.edu
   must be handled first.
@@ -91,3 +104,6 @@ The Git Autoinstaller
     git pull /mit/scripts/deploy/wordpress.git master
     if [ $? ne 0 ]; then git reset --hard; echo 'conflicts during upgrade'; fi
     ./.scripts/update
+
+* Make install-statistics generate nice pretty graphs of installs by date
+  (more histograms, will need to check actual .scripts-version files.)

diff --git a/bin/install-statistics b/bin/install-statistics
index 62f47d829f4d5e10d453ffd92afe590fb7db8ed5..cf78c5646c179c233560d3fbd4640d78192112d2 100755 (executable)
--- a/bin/install-statistics
+++ b/bin/install-statistics
@@ -139,7 +139,7 @@ optionally pass application parameters to filter the installs."""
     errors = 0
     unrecognized = 0
     processed = 0
-    hanging = False
+    hanging = False # whether or not we last outputted a newline
     if not options.quiet: print "Processing",
     for line in fi:
         processed += 1
@@ -159,7 +159,7 @@ optionally pass application parameters to filter the installs."""
         deploy.count()
         if options.count_exists:
             r = deploy.count_exists(options.count_exists)
-            if r:
+            if r and options.verbose:
                 if hanging:
                     hanging = False
                     print