FIX: discourse-doctor plugin check too loose (#478)

[discourse_docker.git] / discourse-doctor

diff --git a/discourse-doctor b/discourse-doctor
index 92796e50611130b2df455b2f11eea3d0f835ef7f..4d669000223ba2a2cec412b1a01bf6d3058aa745 100755 (executable)
--- a/discourse-doctor
+++ b/discourse-doctor
@@ -185,7 +185,7 @@ get_discourse_config() {
 
 check_plugins() {
   log -e "\n\n==================== PLUGINS ===================="
-  log -e "$(grep git containers/$app_name.yml)"
+  log -e "$(grep 'git clone' containers/$app_name.yml)"
   grep git containers/$app_name.yml > /tmp/$PPID.grep
 
   if grep -cv "github.com/discourse" /tmp/$PPID.grep > /dev/null
@@ -316,10 +316,16 @@ print_done() {
 
   if [ $app_name == 'app' ] && [ "$NO_CONTAINER" != 'y' ]
   then
-    cp $LOG_FILE shared/standalone/log/var-log/$DOCTOR_FILE
-    sudo docker exec -w /var/www/discourse -i $app_name cp /var/log/$DOCTOR_FILE  public
-    log "The output of this program may be available at http://$DISCOURSE_HOSTNAME/$DOCTOR_FILE"
-    log "You should inspect that file carefully before sharing the URL."
+    read -p "Would you like to serve a publicly available version of this file? (Y/n)" serve
+    if [ $serve == 'Y' ]
+    then
+        cp $LOG_FILE shared/standalone/log/var-log/$DOCTOR_FILE
+        sudo docker exec -w /var/www/discourse -i $app_name cp /var/log/$DOCTOR_FILE  public
+        log "The output of this program may be available at http://$DISCOURSE_HOSTNAME/$DOCTOR_FILE"
+        log "You should inspect that file carefully before sharing the URL."
+    else
+        log "Publicly available log not generated."
+    fi
   fi
   # The following is not in the web log file since it was copied above, which seems corect
   log