浏览代码

update to populate qvitter notifications table

Bob Mottram 8 年前
父节点
当前提交
1e5784cd8e
共有 3 个文件被更改,包括 18 次插入5 次删除
  1. 1
    3
      src/freedombone-app-gnusocial
  2. 12
    2
      src/freedombone-app-postactiv
  3. 5
    0
      src/freedombone-utils-gnusocialtools

+ 1
- 3
src/freedombone-app-gnusocial 查看文件

@@ -470,9 +470,6 @@ function remove_gnusocial {
470 470
         rm /etc/cron.hourly/gnusocial-daemons
471 471
     fi
472 472
     remove_backup_database_local gnusocial
473
-    if [ -d $INSTALL_DIR/pleroma ]; then
474
-        rm -rf $INSTALL_DIR/pleroma
475
-    fi
476 473
 
477 474
     function_check remove_ddns_domain
478 475
     remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME
@@ -779,6 +776,7 @@ function install_gnusocial_plugin_sharings {
779 776
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins/Sharings
780 777
     php scripts/seedsharings.php
781 778
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs
779
+    php scripts/upgrade.php
782 780
     php scripts/checkschema.php
783 781
 
784 782
     # Languages

+ 12
- 2
src/freedombone-app-postactiv 查看文件

@@ -771,11 +771,21 @@ function install_postactiv {
771 771
     fi
772 772
 
773 773
     install_postactiv_main
774
+    install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
774 775
 
775
-    #install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
776 776
     #function_check install_nodejs
777 777
     #install_nodejs pleroma-postactiv
778
-    #install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
778
+
779
+    # Currently Pleroma won't install on ARM systems
780
+    # because it uses node-sass which doesn't support ARM
781
+    if [[ "$(arch)" == "arm"* ]]; then
782
+        echo -m $'WARNING: Pleroma currently does not support ARM '
783
+        echo $'architecture, so it will not be installed'
784
+    else
785
+        function_check install_nodejs
786
+        install_nodejs pleroma-gnusocial
787
+        install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
788
+    fi
779 789
 
780 790
     expire_postactiv_posts
781 791
 

+ 5
- 0
src/freedombone-utils-gnusocialtools 查看文件

@@ -150,6 +150,11 @@ function install_qvitter {
150 150
 
151 151
     chown -R www-data:www-data /var/www/${domain_name}/htdocs
152 152
 
153
+    cd /var/www/${domain_name}/htdocs
154
+    php scripts/upgrade.php
155
+    php scripts/checkschema.php
156
+    chown -R www-data:www-data /var/www/${domain_name}/htdocs
157
+
153 158
     set_completion_param "${app_name} theme commit" "$QVITTER_THEME_COMMIT"
154 159
 
155 160
     install_completed ${app_name}_theme