From bcb3bb5ece4cc6b2bafd66fad535d88eec899954 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 17 Nov 2017 20:59:09 -0500 Subject: [PATCH] developer cannot even do this developer cannot even do rgetem, so it's pointless to add this type of change in there. since developer also shouldn't see any checkout problems in the fred area, just drop this code. --- scripts/site_avenger/revamp_cakelampvm.sh | 35 ----------------------- 1 file changed, 35 deletions(-) diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 950ad5bc..ccd3ed9c 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -129,41 +129,6 @@ fi ############## -# clean out some old files that were not checked in in mapsdemo. -echo Doing some git repository maintenance in fred account. -# -# change over to fred folder -pushd /home/fred -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" - -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 - -popd -#...coolness, if we got to here. - ############## # sequel--tell them they're great and show the hello again also. -- 2.34.1