free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standardise terminology to avoid confusions

This commit is contained in:
Bob Mottram 2016-02-04 10:38:07 +00:00
parent d4236b00f9
commit 4b3ca5de7d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/freedombone
View File

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