From ce1557b02b4d5df86c580691080d96ed572710fa Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 3 Feb 2016 18:37:14 +0000 Subject: [PATCH] gnusocial theme commit --- src/freedombone | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/freedombone b/src/freedombone index 97c756b3..61307885 100755 --- a/src/freedombone +++ b/src/freedombone @@ -8586,15 +8586,15 @@ function install_gnu_social_theme { # update to the next commit 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 + CURRENT_MICROBLOG_THEME_COMMIT=$(grep "GNU Social theme commit" $COMPLETION_FILE | awk -F ':' '{print $2}') + if [[ "$CURRENT_MICROBLOG_THEME_COMMIT" != "$MICROBLOG_THEME_COMMIT" ]]; then cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins - git_pull $MICROBLOG_THEME_REPO $GNUSOCIAL_THEME_COMMIT + git_pull $MICROBLOG_THEME_REPO $MICROBLOG_THEME_COMMIT sed -i "s/GNU Social theme commit.*/GNU Social theme commit:$GNUSOCIAL_THEME_COMMIT/g" $COMPLETION_FILE chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local fi else - echo "GNU Social theme commit:$GNUSOCIAL_THEME_COMMIT" >> $COMPLETION_FILE + echo "GNU Social theme commit:$MICROBLOG_THEME_COMMIT" >> $COMPLETION_FILE fi fi @@ -8607,7 +8607,7 @@ function install_gnu_social_theme { fi cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins - git_clone $MICROBLOG_THEME_REPO $GNUSOCIAL_THEME_COMMIT + git_clone $MICROBLOG_THEME_REPO $MICROBLOG_THEME_COMMIT if ! grep -q "addPlugin('Qvitter')" /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php; then echo "addPlugin('Qvitter');" >> /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php