|
@@ -8586,15 +8586,15 @@ function install_gnu_social_theme {
|
8586
|
8586
|
# update to the next commit
|
8587
|
8587
|
if grep -q "addPlugin('Qvitter')" /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php; then
|
8588
|
8588
|
if grep -q "GNU Social theme commit" $COMPLETION_FILE; then
|
8589
|
|
- CURRENT_GNUSOCIAL_THEME_COMMIT=$(grep "GNU Social theme commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
|
8590
|
|
- if [[ "$CURRENT_GNUSOCIAL_THEME_COMMIT" != "$GNUSOCIAL_THEME_COMMIT" ]]; then
|
|
8589
|
+ CURRENT_MICROBLOG_THEME_COMMIT=$(grep "GNU Social theme commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
|
|
8590
|
+ if [[ "$CURRENT_MICROBLOG_THEME_COMMIT" != "$MICROBLOG_THEME_COMMIT" ]]; then
|
8591
|
8591
|
cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins
|
8592
|
|
- git_pull $MICROBLOG_THEME_REPO $GNUSOCIAL_THEME_COMMIT
|
|
8592
|
+ git_pull $MICROBLOG_THEME_REPO $MICROBLOG_THEME_COMMIT
|
8593
|
8593
|
sed -i "s/GNU Social theme commit.*/GNU Social theme commit:$GNUSOCIAL_THEME_COMMIT/g" $COMPLETION_FILE
|
8594
|
8594
|
chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local
|
8595
|
8595
|
fi
|
8596
|
8596
|
else
|
8597
|
|
- echo "GNU Social theme commit:$GNUSOCIAL_THEME_COMMIT" >> $COMPLETION_FILE
|
|
8597
|
+ echo "GNU Social theme commit:$MICROBLOG_THEME_COMMIT" >> $COMPLETION_FILE
|
8598
|
8598
|
fi
|
8599
|
8599
|
fi
|
8600
|
8600
|
|
|
@@ -8607,7 +8607,7 @@ function install_gnu_social_theme {
|
8607
|
8607
|
fi
|
8608
|
8608
|
|
8609
|
8609
|
cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins
|
8610
|
|
- git_clone $MICROBLOG_THEME_REPO $GNUSOCIAL_THEME_COMMIT
|
|
8610
|
+ git_clone $MICROBLOG_THEME_REPO $MICROBLOG_THEME_COMMIT
|
8611
|
8611
|
|
8612
|
8612
|
if ! grep -q "addPlugin('Qvitter')" /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php; then
|
8613
|
8613
|
echo "addPlugin('Qvitter');" >> /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php
|