From 5be1dbea61834798ad4be3699165f754a9f15b11 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 3 Feb 2016 18:02:21 +0000 Subject: [PATCH] Tidying --- src/freedombone | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedombone b/src/freedombone index 3d3216d0..97c756b3 100755 --- a/src/freedombone +++ b/src/freedombone @@ -8584,7 +8584,7 @@ function install_gnu_social_theme { fi # update to the next commit - if [ -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then + if grep -q "addPlugin('Qvitter')" /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php; then if grep -q "GNU Social theme commit" $COMPLETION_FILE; then CURRENT_GNUSOCIAL_THEME_COMMIT=$(grep "GNU Social theme commit" $COMPLETION_FILE | awk -F ':' '{print $2}') if [[ "$CURRENT_GNUSOCIAL_THEME_COMMIT" != "$GNUSOCIAL_THEME_COMMIT" ]]; then @@ -8606,6 +8606,7 @@ function install_gnu_social_theme { mkdir -p /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins fi + cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins git_clone $MICROBLOG_THEME_REPO $GNUSOCIAL_THEME_COMMIT if ! grep -q "addPlugin('Qvitter')" /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php; then @@ -8614,7 +8615,6 @@ function install_gnu_social_theme { chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs - #MICROBLOG_THEME_REPO echo 'install_gnu_social_theme' >> $COMPLETION_FILE }