##############
+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.
# 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
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
-test_or_die "stashing mapsdemo changes"
-git stash drop
-test_or_die "dropping mapsdemo stash"
+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.
##############