From 4b3ca5de7d43647581c1b009f4d493a88fa0fdd4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 4 Feb 2016 10:38:07 +0000
Subject: [PATCH] Standardise terminology to avoid confusions

---
 src/freedombone | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index cadc19e6..438d4cbe 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -196,7 +196,7 @@ MICROBLOG_CODE=
 MICROBLOG_ONION_PORT=8087
 MICROBLOG_REPO="https://git.gnu.io/gnu/gnu-social.git"
 MICROBLOG_ADMIN_PASSWORD=
-GNUSOCIAL_COMMIT='771f08b3c761ff122c3fff7bdb13ec6625828018'
+MICROBLOG_COMMIT='771f08b3c761ff122c3fff7bdb13ec6625828018'
 MICROBLOG_THEME_REPO="https://git.gnu.io/h2p/Qvitter.git"
 MICROBLOG_THEME_COMMIT='8abbdeb3c0a6a34754411452ae832d2f19cef7ab'
 MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to $MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another Freedombone site</p>'
@@ -1089,8 +1089,8 @@ function read_configuration {
         if grep -q "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE; then
             ZERONET_FORUM_COMMIT=$(grep "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
         fi
-        if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
-            GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        if grep -q "MICROBLOG_COMMIT" $CONFIGURATION_FILE; then
+            MICROBLOG_COMMIT=$(grep "MICROBLOG_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
         fi
         if grep -q "NGINX_ENSITE_REPO" $CONFIGURATION_FILE; then
             NGINX_ENSITE_REPO=$(grep "NGINX_ENSITE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
@@ -8266,15 +8266,15 @@ function install_gnu_social {
     # update to the next commit
     if [ -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
         if grep -q "GNU Social commit" $COMPLETION_FILE; then
-            CURRENT_GNUSOCIAL_COMMIT=$(grep "GNU Social commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
-            if [[ "$CURRENT_GNUSOCIAL_COMMIT" != "$GNUSOCIAL_COMMIT" ]]; then
+            CURRENT_MICROBLOG_COMMIT=$(grep "GNU Social commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
+            if [[ "$CURRENT_MICROBLOG_COMMIT" != "$MICROBLOG_COMMIT" ]]; then
                 cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
-                git_pull $MICROBLOG_REPO $GNUSOCIAL_COMMIT
-                sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
+                git_pull $MICROBLOG_REPO $MICROBLOG_COMMIT
+                sed -i "s/GNU Social commit.*/GNU Social commit:$MICROBLOG_COMMIT/g" $COMPLETION_FILE
                 chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
             fi
         else
-            echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
+            echo "GNU Social commit:$MICROBLOG_COMMIT" >> $COMPLETION_FILE
         fi
     fi
 
@@ -8300,11 +8300,11 @@ function install_gnu_social {
     fi
 
     cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
-    git checkout $GNUSOCIAL_COMMIT -b $GNUSOCIAL_COMMIT
+    git checkout $MICROBLOG_COMMIT -b $MICROBLOG_COMMIT
     if ! grep -q "GNU Social commit" $COMPLETION_FILE; then
-        echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
+        echo "GNU Social commit:$MICROBLOG_COMMIT" >> $COMPLETION_FILE
     else
-        sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
+        sed -i "s/GNU Social commit.*/GNU Social commit:$MICROBLOG_COMMIT/g" $COMPLETION_FILE
     fi
 
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs