Tidying

src/freedombone-app-gnusocial

@@ -368,7 +368,7 @@ function install_gnusocial_main {
         exit 7359
     fi
 
-    if grep -Fxq "install_gnusocial_main" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial_main) == "1" ]]; then
         return
     fi
 
@@ -625,7 +625,7 @@ function install_gnusocial_main {
     echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
 
     echo "GNU Social domain:$MICROBLOG_DOMAIN_NAME" >> $COMPLETION_FILE
-    echo 'install_gnusocial_main' >> $COMPLETION_FILE
+    install_completed gnusocial_main
 }
 
 function install_gnusocial_plugin_sharings {
@@ -640,7 +640,7 @@ function install_gnusocial_plugin_sharings {
     function_check set_repo_commit
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings plugin commit" "$SHARINGS_COMMIT" $SHARINGS_REPO
 
-    if grep -Fxq "install_gnusocial_plugin_sharings" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial_plugin_sharings) == "1" ]]; then
         return
     fi
 
@@ -697,7 +697,7 @@ function install_gnusocial_plugin_sharings {
     else
         sed -i "s|GNU Social sharings plugin commit.*|GNU Social sharings plugin commit:$SHARINGS_COMMIT|g" $COMPLETION_FILE
     fi
-    echo 'install_gnusocial_plugin_sharings' >> $COMPLETION_FILE
+    install_completed gnusocial_plugin_sharings
 }
 
 function install_gnusocial_plugin_sharings_theme {
@@ -710,7 +710,7 @@ function install_gnusocial_plugin_sharings_theme {
     function_check set_repo_commit
     set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins "GNU Social sharings theme plugin commit" "$SHARINGS_THEME_COMMIT" $SHARINGS_THEME_REPO
 
-    if grep -Fxq "install_gnusocial_plugin_sharings_theme" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial_plugin_sharings_theme) == "1" ]]; then
         return
     fi
 
@@ -743,7 +743,7 @@ function install_gnusocial_plugin_sharings_theme {
     else
         sed -i "s|GNU Social sharings plugin theme commit.*|GNU Social sharings plugin theme commit:$SHARINGS_THEME_COMMIT|g" $COMPLETION_FILE
     fi
-    echo 'install_gnusocial_plugin_sharings_theme' >> $COMPLETION_FILE
+    install_completed gnusocial_plugin_sharings_theme
 }
 
 function expire_gnusocial_posts {
@@ -813,7 +813,7 @@ function install_gnusocial_theme {
         fi
     fi
 
-    if grep -Fxq "install_gnusocial_theme" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial_theme) == "1" ]]; then
         return
     fi
 
@@ -897,7 +897,7 @@ function install_gnusocial_theme {
 
     chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
 
-    echo 'install_gnusocial_theme' >> $COMPLETION_FILE
+    install_completed gnusocial_theme
 }
 
 function install_gnusocial_markdown {
@@ -907,7 +907,7 @@ function install_gnusocial_markdown {
     function_check set_repo_commit
     set_repo_commit $MICROBLOG_PATH/local/plugins/Markdown "GNU Social Markdown commit" "$MICROBLOG_MARKDOWN_COMMIT" $MICROBLOG_MARKDOWN_REPO
 
-    if grep -Fxq "install_gnusocial_markdown" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial_markdown) == "1" ]]; then
         return
     fi
 
@@ -938,7 +938,7 @@ function install_gnusocial_markdown {
 
     chown -R www-data:www-data $MICROBLOG_PATH
 
-    echo 'install_gnusocial_markdown' >> $COMPLETION_FILE
+    install_completed gnusocial_markdown
 }
 
 function install_gnusocial_plugin_nsfw {
@@ -984,7 +984,7 @@ function install_gnusocial_plugin_nsfw {
     else
         sed -i "s|GNU Social NSFW plugin commit.*|GNU Social NSFW plugin commit:$GNUSOCIAL_NSFW_COMMIT|g" $COMPLETION_FILE
     fi
-    echo 'install_gnusocial_plugin_nsfw' >> $COMPLETION_FILE
+    install_completed gnusocial_plugin_nsfw
 }
 
 function install_gnusocial {