소스 검색

Standardise terminology to avoid confusions

Bob Mottram 9 년 전
부모
커밋
4b3ca5de7d
1개의 변경된 파일11개의 추가작업 그리고 11개의 파일을 삭제
  1. 11
    11
      src/freedombone

+ 11
- 11
src/freedombone 파일 보기

196
 MICROBLOG_ONION_PORT=8087
196
 MICROBLOG_ONION_PORT=8087
197
 MICROBLOG_REPO="https://git.gnu.io/gnu/gnu-social.git"
197
 MICROBLOG_REPO="https://git.gnu.io/gnu/gnu-social.git"
198
 MICROBLOG_ADMIN_PASSWORD=
198
 MICROBLOG_ADMIN_PASSWORD=
199
-GNUSOCIAL_COMMIT='771f08b3c761ff122c3fff7bdb13ec6625828018'
199
+MICROBLOG_COMMIT='771f08b3c761ff122c3fff7bdb13ec6625828018'
200
 MICROBLOG_THEME_REPO="https://git.gnu.io/h2p/Qvitter.git"
200
 MICROBLOG_THEME_REPO="https://git.gnu.io/h2p/Qvitter.git"
201
 MICROBLOG_THEME_COMMIT='8abbdeb3c0a6a34754411452ae832d2f19cef7ab'
201
 MICROBLOG_THEME_COMMIT='8abbdeb3c0a6a34754411452ae832d2f19cef7ab'
202
 MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to $MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another Freedombone site</p>'
202
 MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to $MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another Freedombone site</p>'
1089
         if grep -q "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE; then
1089
         if grep -q "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE; then
1090
             ZERONET_FORUM_COMMIT=$(grep "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1090
             ZERONET_FORUM_COMMIT=$(grep "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1091
         fi
1091
         fi
1092
-        if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
1093
-            GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1092
+        if grep -q "MICROBLOG_COMMIT" $CONFIGURATION_FILE; then
1093
+            MICROBLOG_COMMIT=$(grep "MICROBLOG_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1094
         fi
1094
         fi
1095
         if grep -q "NGINX_ENSITE_REPO" $CONFIGURATION_FILE; then
1095
         if grep -q "NGINX_ENSITE_REPO" $CONFIGURATION_FILE; then
1096
             NGINX_ENSITE_REPO=$(grep "NGINX_ENSITE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1096
             NGINX_ENSITE_REPO=$(grep "NGINX_ENSITE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
8266
     # update to the next commit
8266
     # update to the next commit
8267
     if [ -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
8267
     if [ -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
8268
         if grep -q "GNU Social commit" $COMPLETION_FILE; then
8268
         if grep -q "GNU Social commit" $COMPLETION_FILE; then
8269
-            CURRENT_GNUSOCIAL_COMMIT=$(grep "GNU Social commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8270
-            if [[ "$CURRENT_GNUSOCIAL_COMMIT" != "$GNUSOCIAL_COMMIT" ]]; then
8269
+            CURRENT_MICROBLOG_COMMIT=$(grep "GNU Social commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8270
+            if [[ "$CURRENT_MICROBLOG_COMMIT" != "$MICROBLOG_COMMIT" ]]; then
8271
                 cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8271
                 cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8272
-                git_pull $MICROBLOG_REPO $GNUSOCIAL_COMMIT
8273
-                sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
8272
+                git_pull $MICROBLOG_REPO $MICROBLOG_COMMIT
8273
+                sed -i "s/GNU Social commit.*/GNU Social commit:$MICROBLOG_COMMIT/g" $COMPLETION_FILE
8274
                 chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8274
                 chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8275
             fi
8275
             fi
8276
         else
8276
         else
8277
-            echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
8277
+            echo "GNU Social commit:$MICROBLOG_COMMIT" >> $COMPLETION_FILE
8278
         fi
8278
         fi
8279
     fi
8279
     fi
8280
 
8280
 
8300
     fi
8300
     fi
8301
 
8301
 
8302
     cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8302
     cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8303
-    git checkout $GNUSOCIAL_COMMIT -b $GNUSOCIAL_COMMIT
8303
+    git checkout $MICROBLOG_COMMIT -b $MICROBLOG_COMMIT
8304
     if ! grep -q "GNU Social commit" $COMPLETION_FILE; then
8304
     if ! grep -q "GNU Social commit" $COMPLETION_FILE; then
8305
-        echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
8305
+        echo "GNU Social commit:$MICROBLOG_COMMIT" >> $COMPLETION_FILE
8306
     else
8306
     else
8307
-        sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
8307
+        sed -i "s/GNU Social commit.*/GNU Social commit:$MICROBLOG_COMMIT/g" $COMPLETION_FILE
8308
     fi
8308
     fi
8309
 
8309
 
8310
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8310
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs