Script refinement

diff --git a/dumper b/dumper
old mode 100644 (file)
new mode 100755 (executable)
index 9f991d5..b47fc42
--- a/dumper
+++ b/dumper
@@ -2,11 +2,11 @@
 
 function f
 {
-        echo $@ >&2; $@
+        echo "$@" >&2; "$@"
 }
 date=$(date +%Y-%m-%d)
 
 mkdir -p dump/$date/
-for repos in mathcamp phillipian sisugames alex/transfer alex/website alex/program monopoly
-    do f svnadmin dump $repos > dump/$date/$(basename $repos).dump;
+for repos in mathcamp phillipian sisugames alex/transfer alex/website alex/program monopoly; do
+    f svnadmin dump $repos > dump/$date/$(basename $repos).dump;
 done

diff --git a/loader b/loader
old mode 100644 (file)
new mode 100755 (executable)
index 7c7a2bf..43730a5
--- a/loader
+++ b/loader
@@ -1,11 +1,19 @@
-function f { echo $@; $@; }
+#!/bin/bash
 
-for repos in mathcamp phillipian sisugames alex/transfer alex/website alex/program monopoly; 
-    do echo
-    echo repos is $repos
-    f rm -r $repos
-    f sudo svnadmin create $repos
-    f sudo svnadmin load $repos < dump/`basename $repos`.dump
-    f sudo chgrp -R www-data $repos
-    f sudo chmod -R g+w $repos
+set -e
+
+function f { echo "$@"; "$@"; }
+
+variant=${1:-FAILFAILFAIL}
+save=${2:-save}
+mkdir -p $save
+for repo in mathcamp phillipian sisugames alex/transfer alex/website alex/program monopoly; do
+    echo
+    echo repo is $repo
+    repobase=$(basename $repo)
+    f mv $repo $save/$repobase || echo "Could not find original of '$repo' to preserve"
+    f sudo svnadmin create $repo
+    f sudo svnadmin load $repo < dump/$variant/$repobase.dump
+    f sudo chgrp -R www-data $repo
+    f sudo chmod -R g+w $repo
 done