Bob Mottram преди 8 години
родител
ревизия
b0fd5f1cee
променени са 1 файла, в които са добавени 11 реда и са изтрити 11 реда
  1. 11
    11
      src/freedombone-app-gnusocial

+ 11
- 11
src/freedombone-app-gnusocial Целия файл

368
         exit 7359
368
         exit 7359
369
     fi
369
     fi
370
 
370
 
371
-    if grep -Fxq "install_gnusocial_main" $COMPLETION_FILE; then
371
+    if [[ $(app_is_installed gnusocial_main) == "1" ]]; then
372
         return
372
         return
373
     fi
373
     fi
374
 
374
 
625
     echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
625
     echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
626
 
626
 
627
     echo "GNU Social domain:$MICROBLOG_DOMAIN_NAME" >> $COMPLETION_FILE
627
     echo "GNU Social domain:$MICROBLOG_DOMAIN_NAME" >> $COMPLETION_FILE
628
-    echo 'install_gnusocial_main' >> $COMPLETION_FILE
628
+    install_completed gnusocial_main
629
 }
629
 }
630
 
630
 
631
 function install_gnusocial_plugin_sharings {
631
 function install_gnusocial_plugin_sharings {
640
     function_check set_repo_commit
640
     function_check set_repo_commit
641
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings plugin commit" "$SHARINGS_COMMIT" $SHARINGS_REPO
641
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings plugin commit" "$SHARINGS_COMMIT" $SHARINGS_REPO
642
 
642
 
643
-    if grep -Fxq "install_gnusocial_plugin_sharings" $COMPLETION_FILE; then
643
+    if [[ $(app_is_installed gnusocial_plugin_sharings) == "1" ]]; then
644
         return
644
         return
645
     fi
645
     fi
646
 
646
 
697
     else
697
     else
698
         sed -i "s|GNU Social sharings plugin commit.*|GNU Social sharings plugin commit:$SHARINGS_COMMIT|g" $COMPLETION_FILE
698
         sed -i "s|GNU Social sharings plugin commit.*|GNU Social sharings plugin commit:$SHARINGS_COMMIT|g" $COMPLETION_FILE
699
     fi
699
     fi
700
-    echo 'install_gnusocial_plugin_sharings' >> $COMPLETION_FILE
700
+    install_completed gnusocial_plugin_sharings
701
 }
701
 }
702
 
702
 
703
 function install_gnusocial_plugin_sharings_theme {
703
 function install_gnusocial_plugin_sharings_theme {
710
     function_check set_repo_commit
710
     function_check set_repo_commit
711
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings theme plugin commit" "$SHARINGS_THEME_COMMIT" $SHARINGS_THEME_REPO
711
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings theme plugin commit" "$SHARINGS_THEME_COMMIT" $SHARINGS_THEME_REPO
712
 
712
 
713
-    if grep -Fxq "install_gnusocial_plugin_sharings_theme" $COMPLETION_FILE; then
713
+    if [[ $(app_is_installed gnusocial_plugin_sharings_theme) == "1" ]]; then
714
         return
714
         return
715
     fi
715
     fi
716
 
716
 
743
     else
743
     else
744
         sed -i "s|GNU Social sharings plugin theme commit.*|GNU Social sharings plugin theme commit:$SHARINGS_THEME_COMMIT|g" $COMPLETION_FILE
744
         sed -i "s|GNU Social sharings plugin theme commit.*|GNU Social sharings plugin theme commit:$SHARINGS_THEME_COMMIT|g" $COMPLETION_FILE
745
     fi
745
     fi
746
-    echo 'install_gnusocial_plugin_sharings_theme' >> $COMPLETION_FILE
746
+    install_completed gnusocial_plugin_sharings_theme
747
 }
747
 }
748
 
748
 
749
 function expire_gnusocial_posts {
749
 function expire_gnusocial_posts {
813
         fi
813
         fi
814
     fi
814
     fi
815
 
815
 
816
-    if grep -Fxq "install_gnusocial_theme" $COMPLETION_FILE; then
816
+    if [[ $(app_is_installed gnusocial_theme) == "1" ]]; then
817
         return
817
         return
818
     fi
818
     fi
819
 
819
 
897
 
897
 
898
     chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
898
     chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
899
 
899
 
900
-    echo 'install_gnusocial_theme' >> $COMPLETION_FILE
900
+    install_completed gnusocial_theme
901
 }
901
 }
902
 
902
 
903
 function install_gnusocial_markdown {
903
 function install_gnusocial_markdown {
907
     function_check set_repo_commit
907
     function_check set_repo_commit
908
     set_repo_commit $MICROBLOG_PATH/local/plugins/Markdown "GNU Social Markdown commit" "$MICROBLOG_MARKDOWN_COMMIT" $MICROBLOG_MARKDOWN_REPO
908
     set_repo_commit $MICROBLOG_PATH/local/plugins/Markdown "GNU Social Markdown commit" "$MICROBLOG_MARKDOWN_COMMIT" $MICROBLOG_MARKDOWN_REPO
909
 
909
 
910
-    if grep -Fxq "install_gnusocial_markdown" $COMPLETION_FILE; then
910
+    if [[ $(app_is_installed gnusocial_markdown) == "1" ]]; then
911
         return
911
         return
912
     fi
912
     fi
913
 
913
 
938
 
938
 
939
     chown -R www-data:www-data $MICROBLOG_PATH
939
     chown -R www-data:www-data $MICROBLOG_PATH
940
 
940
 
941
-    echo 'install_gnusocial_markdown' >> $COMPLETION_FILE
941
+    install_completed gnusocial_markdown
942
 }
942
 }
943
 
943
 
944
 function install_gnusocial_plugin_nsfw {
944
 function install_gnusocial_plugin_nsfw {
984
     else
984
     else
985
         sed -i "s|GNU Social NSFW plugin commit.*|GNU Social NSFW plugin commit:$GNUSOCIAL_NSFW_COMMIT|g" $COMPLETION_FILE
985
         sed -i "s|GNU Social NSFW plugin commit.*|GNU Social NSFW plugin commit:$GNUSOCIAL_NSFW_COMMIT|g" $COMPLETION_FILE
986
     fi
986
     fi
987
-    echo 'install_gnusocial_plugin_nsfw' >> $COMPLETION_FILE
987
+    install_completed gnusocial_plugin_nsfw
988
 }
988
 }
989
 
989
 
990
 function install_gnusocial {
990
 function install_gnusocial {