瀏覽代碼

Check if redmatrix is installed

Bob Mottram 10 年之前
父節點
當前提交
5c792878b1
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4
    6
      install-freedombone.sh

+ 4
- 6
install-freedombone.sh 查看文件

@@ -155,7 +155,6 @@ REDMATRIX_FREEDNS_SUBDOMAIN_CODE=
155 155
 REDMATRIX_REPO="https://github.com/friendica/red.git"
156 156
 REDMATRIX_ADDONS_REPO="https://github.com/friendica/red-addons.git"
157 157
 REDMATRIX_ADMIN_PASSWORD=
158
-REDMATRIX_INSTALLED="no"
159 158
 
160 159
 # Domain name or freedns subdomain for Owncloud installation
161 160
 OWNCLOUD_DOMAIN_NAME=
@@ -497,7 +496,7 @@ function create_backup_script {
497 496
       echo 'echo "Obtaining GNU Social database backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
498 497
       echo "mysqldump --password=$MARIADB_PASSWORD gnusocial > /home/$MY_USERNAME/tempfiles/gnusocial.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
499 498
   fi
500
-  if [[ $REDMATRIX_INSTALLED == "yes" ]]; then
499
+  if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
501 500
       echo 'echo "Obtaining Red Matrix database backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
502 501
       echo "mysqldump --password=$MARIADB_PASSWORD redmatrix > /home/$MY_USERNAME/tempfiles/redmatrix.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
503 502
   fi
@@ -660,7 +659,7 @@ function create_restore_script {
660 659
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
661 660
   fi
662 661
 
663
-  if [[ $REDMATRIX_INSTALLED == "yes" ]]; then
662
+  if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
664 663
       echo "if [ -f /home/$MY_USERNAME/tempfiles/redmatrix.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
665 664
       echo '  echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
666 665
       echo "  mysql -u root --password=$MARIADB_PASSWORD redmatrix -o < /home/$MY_USERNAME/tempfiles/redmatrix.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -761,7 +760,7 @@ function backup_to_friends_servers {
761 760
       echo "  mysqldump --password=$MARIADB_PASSWORD gnusocial > /home/$MY_USERNAME/tempfiles/gnusocial.sql" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
762 761
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
763 762
   fi
764
-  if [[ $REDMATRIX_INSTALLED == "yes" ]]; then
763
+  if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
765 764
       echo 'if [ -f /var/backups/redmatrix_daily.sql ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
766 765
       echo "  cp /var/backups/redmatrix_daily.sql /home/$MY_USERNAME/tempfiles/redmatrix.sql" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
767 766
       echo 'else' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -945,7 +944,7 @@ function restore_from_friend {
945 944
       echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
946 945
   fi
947 946
 
948
-  if [[ $REDMATRIX_INSTALLED == "yes" ]]; then
947
+  if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
949 948
       echo "if [ -f /home/$MY_USERNAME/tempfiles/redmatrix.sql ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
950 949
       echo '  echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
951 950
       echo "  mysql -u root --password=$MARIADB_PASSWORD redmatrix -o < /home/$MY_USERNAME/tempfiles/redmatrix.sql" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4231,7 +4230,6 @@ quit" > $INSTALL_DIR/batch.sql
4231 4230
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
4232 4231
   fi
4233 4232
 
4234
-  REDMATRIX_INSTALLED="yes"
4235 4233
   echo 'install_redmatrix' >> $COMPLETION_FILE
4236 4234
 }
4237 4235