catching stash fail on no changes now

[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 578226c42cfe2687dbe88ee4ef38edca56f17f0f..1d02bcb9560e5927af8b5a1d060fb2cb0f192bde 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -97,6 +97,9 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then
   # the old site is in place still, so let's update that.
   echo "Updating default web sites to latest version."
 
+  a2enmod ssl
+  test_or_die "enabling SSL for secure websites"
+
   a2dissite 000-default
   test_or_die "disabling old apache site"
 
@@ -129,9 +132,11 @@ 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"
+if [ $? -eq 0 ]; then
+  # we actually stashed something, so deal with that.
+  git stash drop 
+  test_or_die "dropping mapsdemo stash"
+fi
 
 popd