# install a better editor app.
-echo "
-The script is about to install the bluefish editor and some dependencies.
+echo " The script is about to install the bluefish editor and some dependencies.
If the app is not already installed, then this process takes only about a
-minute on a slower home DSL internet connection...
-
-"
+minute on a slower home DSL internet connection..."
apt-get install -y bluefish &> "/tmp/install_bluefish-$(logname).log"
test_or_continue "installing bluefish editor"
# site config files. our original site was 000 and the new version is 001,
# which we've done as a prefix on the config for some reason. makes the
# code below easy at least.
-if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
+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"
pushd /home/fred
test_or_die "changing dir to fred's home; what have you done with fred?"
-pushd apps/mapsdemo
+pushd apps/mapsdemo/public
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