had to take an entirely different approach

[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 1d02bcb9560e5927af8b5a1d060fb2cb0f192bde..8c902c3790064b612f0eb5100a48364eb22eadd0 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -20,6 +20,13 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 
 ##############
 
+echo "Regenerating feisty meow loading dock."
+
+reconfigure_feisty_meow
+test_or_die "feisty meow reconfiguration"
+
+##############
+
 echo "Making some important permission changes..."
 
 # fix up the main web storage.
@@ -127,24 +134,33 @@ echo Doing some git repository maintenance in fred account.
 pushd /home/fred
 test_or_die "changing dir to fred's home; what have you done with fred?"
 
-pushd apps/mapsdemo/public
+pushd apps/mapsdemo/avenger5
 test_or_die "changing dir to mapsdemo app"
 
-# gets rid of the old version of configs.
-git stash 
-if [ $? -eq 0 ]; then
-  # we actually stashed something, so deal with that.
-  git stash drop 
-  test_or_die "dropping mapsdemo stash"
+rpuffer . &>/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"
+
+  rpuffer .
+#hmmm: use output saver thing when that exists.
+  test_or_die "puffing out 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.
 
 ##############