* Clean up reportbug script a bit, and extend it to dis...

[ntk/apt.git] / debian / bugscript

diff --git a/debian/bugscript b/debian/bugscript
dissimilarity index 61%
index 4e8e628..8423e07 100755 (executable)
--- a/debian/bugscript
+++ b/debian/bugscript
@@ -1,37 +1,33 @@
-#!/bin/sh -e
-
-# reportbug #169495
-if [ -z "$YESNO" ]; then
-  YESNO=$"yYnN"
-fi
-
-cat <<EOF
-I can automatically include various information about your apt configuration in
-your bug report.  This information may help to diagnose your problem.
-
-EOF
-
-yesno "May I include your apt configuration (/etc/apt/apt.conf)? [Y/n] " yep
-
-if [ "$REPLY" = "yep" ]; then
-  echo -e "\n-- apt-config dump --\n" >&3
-  apt-config dump >&3 2>&1
-fi
-
-if [ -f /etc/apt/preferences ]; then
-  yesno "May I include your apt preferences (/etc/apt/preferences)? [Y/n] " yep
-
-  if [ "$REPLY" = "yep" ]; then
-    echo -e "\n-- /etc/apt/preferences --\n" >&3
-    cat /etc/apt/preferences >&3
-  fi
-fi
-
-if [ -f /etc/apt/sources.list ]; then
-  yesno "May I include your sources.list (/etc/apt/sources.list)? [Y/n] " yep
-
-  if [ "$REPLY" = "yep" ]; then
-    echo -e "\n-- /etc/apt/sources.list --\n" >&3
-    cat /etc/apt/sources.list >&3
-  fi
-fi
+#!/bin/sh -e
+
+# reportbug #169495
+if [ -z "$YESNO" ]; then
+  YESNO=$"yYnN"
+fi
+
+cat <<EOF
+I can automatically include various information about your apt configuration in
+your bug report.  This information may help to diagnose your problem.
+
+EOF
+
+yesno "May I include your apt configuration (/etc/apt/apt.conf et al)? [Y/n] " yep
+
+if [ "$REPLY" = "yep" ]; then
+  echo -e "\n-- apt-config dump --\n" >&3
+  apt-config dump >&3 2>&1
+fi
+
+for config in /etc/apt/preferences /etc/apt/sources.list; do
+  if [ -f $config ]; then
+    yesno "May I include your $config configuration file? [Y/n] " yep
+    if [ "$REPLY" = "yep" ]; then
+      echo -e "\n-- $config --\n" >&3
+      cat $config >&3
+    else
+      echo -e "\n-- ($config present, but not submitted) --\n" >&3
+    fi
+  else
+    echo -e "\n-- (no $config present) --\n" >&3
+  fi
+done