developer has no rpuffer access, so just rgetem

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 77c4d91255dee82abdfac8254003bee7485b083d..950ad5bcae0a763c1d5e2eb766ba5dd9784fe101 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -52,6 +52,8 @@ test_or_die "group perms on apache2 and bind"
 # fix perms for fred user.
 chown -R fred:fred /home/fred /home/archives/stuffing 
 test_or_die "chown fred home"
+group_perm $HOME/apps
+test_or_die "group perms on fred's apps"
 harsh_perm /home/fred/.ssh
 test_or_die "harsh_perm setting on fred .ssh"
 chown -R fred:fred /opt/feistymeow.org 
@@ -137,19 +139,30 @@ test_or_die "changing dir to fred's home; what have you done with fred?"
 pushd apps/mapsdemo/avenger5
 test_or_die "changing dir to mapsdemo app"
 
-# gets rid of the old version of configs.
-git stash 
-test_or_die "stashing unwanted mapsdemo changes"
-git stash drop 
-# intentionally ignore error, if there was nothing to drop.
+rgetem . &>/dev/null
+if [ $? -ne 0 ]; then
+  # it seems our old files are still conflicting this.
+  if [ -f config/config_google.php ]; then
+    \rm -f config/config_google.php
+    test_or_die "removing old config for google"
+  fi
+  if [ -f config/app.php ]; then
+    \rm -f config/app.php
+    test_or_die "removing old config for app"
+  fi
+
+  git reset --hard HEAD
+  test_or_die "resetting git's hard head"
+
+  rgetem .
+#hmmm: use output saver thing when that exists.
+  test_or_die "getting mapsdemo app after inadequate corrective action was taken"
+fi
 
 popd
 
-rpuffer apps
-test_or_die "puffing out apps directory"
-
 popd
-#...coolness
+#...coolness, if we got to here.
 
 ##############