|
@@ -196,6 +196,7 @@ HUBZILLA_REPO="https://github.com/redmatrix/hubzilla.git"
|
196
|
196
|
HUBZILLA_ADDONS_REPO="https://github.com/redmatrix/hubzilla-addons.git"
|
197
|
197
|
HUBZILLA_ADMIN_PASSWORD=
|
198
|
198
|
HUBZILLA_COMMIT='761afd029d97703f2f7609d546b7b5f3d257c601'
|
|
199
|
+HUBZILLA_ADDONS_COMMIT='e32f98d65850a8681e8242f3db8b6484abb35c67'
|
199
|
200
|
|
200
|
201
|
# Domain name for git hosting installation
|
201
|
202
|
GIT_DOMAIN_NAME=
|
|
@@ -8455,6 +8456,20 @@ function install_hubzilla {
|
8455
|
8456
|
else
|
8456
|
8457
|
echo "Hubzilla commit:$HUBZILLA_COMMIT" >> $COMPLETION_FILE
|
8457
|
8458
|
fi
|
|
8459
|
+ if grep -q "Hubzilla addons commit" $COMPLETION_FILE; then
|
|
8460
|
+ CURRENT_HUBZILLA_ADDONS_COMMIT=$(grep "Hubzilla addons commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
|
|
8461
|
+ if [[ "$CURRENT_HUBZILLA_ADDONS_COMMIT" != "$HUBZILLA_ADDONS_COMMIT" ]]; then
|
|
8462
|
+ cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon
|
|
8463
|
+ git stash
|
|
8464
|
+ git checkout master
|
|
8465
|
+ git pull
|
|
8466
|
+ git checkout $HUBZILLA_ADDONS_COMMIT -b $HUBZILLA_ADDONS_COMMIT
|
|
8467
|
+ sed -i "s/Hubzilla addons commit.*/Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT/g" $COMPLETION_FILE
|
|
8468
|
+ chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
|
|
8469
|
+ fi
|
|
8470
|
+ else
|
|
8471
|
+ echo "Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT" >> $COMPLETION_FILE
|
|
8472
|
+ fi
|
8458
|
8473
|
fi
|
8459
|
8474
|
|
8460
|
8475
|
if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
|
|
@@ -8487,11 +8502,21 @@ function install_hubzilla {
|
8487
|
8502
|
|
8488
|
8503
|
rm -rf /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
|
8489
|
8504
|
mv hubzilla /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
|
8490
|
|
- chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
|
|
8505
|
+
|
8491
|
8506
|
git clone $HUBZILLA_ADDONS_REPO /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon
|
|
8507
|
+ cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon
|
|
8508
|
+ git checkout $HUBZILLA_ADDONS_COMMIT -b $HUBZILLA_ADDONS_COMMIT
|
|
8509
|
+ if ! grep -q "Hubzilla addons commit" $COMPLETION_FILE; then
|
|
8510
|
+ echo "Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT" >> $COMPLETION_FILE
|
|
8511
|
+ else
|
|
8512
|
+ sed -i "s/Hubzilla addons commit.*/Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT/g" $COMPLETION_FILE
|
|
8513
|
+ fi
|
|
8514
|
+
|
8492
|
8515
|
# some extra themes
|
8493
|
8516
|
git clone https://github.com/DeadSuperHero/redmatrix-themes /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1
|
8494
|
8517
|
cp -r /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1/* view/theme/
|
|
8518
|
+
|
|
8519
|
+ chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
|
8495
|
8520
|
fi
|
8496
|
8521
|
|
8497
|
8522
|
get_mariadb_hubzilla_admin_password
|