contrib: rename scripts/report.sh to scripts/gnunet-bugreport and install it.

Signed-off-by: Nils Gillmann <ng0@n0.is>

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 8e07a5d8c2312b301b2204938776234609c3c42a..81528a90e76bce862addefe1d76838b681616404 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -32,9 +32,11 @@ dist_pkgdata_DATA = \
  gns/gns-form.xslt \
  branding/logo/gnunet-logo.pdf \
  branding/logo/gnunet-logo-color.png \
- scripts/report.sh \
  testing_hostkeys.ecc
 
+bin_PROGRAMS = \
+ scripts/gnunet-bugreport
+
 if MINGW
 tap32_DATA = \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \

diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
new file mode 100755 (executable)
index 0000000..7fbb2f4
--- /dev/null
+++ b/contrib/scripts/gnunet-bugreport
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+TEST=`type type|grep not`
+if test -n "$TEST"; then
+  WHICH=which
+else
+  WHICH=type
+fi
+
+echo "Please submit the following information with your bug report: "
+echo "--------------------------------------------------------------"
+OS=`uname -s 2>/dev/null`
+echo "OS             : $OS"
+REL=`uname -r 2>/dev/null`
+echo "OS RELEASE     : $REL"
+HW=`uname -m 2>/dev/null`
+echo "HARDWARE       : $HW"
+
+TEST=`$WHICH gcc 2>/dev/null`
+if test -n "$TEST"; then
+  VERS=`gcc --version 2>/dev/null | head -n 1`
+  echo "gcc            : $VERS"
+else
+  echo "gcc            : Not Found";
+fi
+
+TEST=`$WHICH gmake 2>/dev/null`
+if test -n "$TEST" ; then
+       gmake --version 2>/dev/null |\
+               awk -F, '{print $1}' |\
+               awk '/GNU Make/{print "GNU gmake      :",$NF}'
+else
+  TEST=`make --version 2>/dev/null`
+  if test -n "$TEST"; then
+               make --version 2>/dev/null |\
+                       awk -F, '{print $1}' |\
+                       awk '/GNU Make/{print "make           :",$NF}'
+  else
+               echo "make           : Not Found"
+  fi
+fi
+
+TEST=`$WHICH autoconf 2>/dev/null`
+if test -n "$TEST"; then
+  autoconf --version |\
+    head -n 1 |\
+    awk '{\
+       if (length($4) == 0) {\
+               print "autoconf       : "$3\
+       } else {\
+               print "autoconf       : "$4\
+       }}'
+else
+  echo "autoconf       : Not Found"
+fi
+
+TEST=`$WHICH automake 2>/dev/null`
+if test -n "$TEST"; then
+  automake --version 2>/dev/null |\
+    head -n 1 |\
+    awk '{print "automake       : "$4}'
+else
+  echo "automake       : Not Found"
+fi
+
+TEST=`$WHICH libtool 2>/dev/null`
+if test -n "$TEST"; then
+  libtool --version 2>/dev/null |\
+    head -n 1 |\
+    awk '{print "libtool        : "$4}'
+else
+  echo "libtool        : Not Found"
+fi
+
+TEST=`$WHICH extract 2>/dev/null`
+if test -n "$TEST"; then
+  extract -v 2>/dev/null |\
+    head -n 1 |\
+    awk '{print "libextractor   : "$2}'
+else
+  echo "libextractor   : Not Found"
+fi
+
+if test -x gnunetd; then
+  gnunetd -v | sed -e "s/v//" 2>/dev/null |\
+    awk '{print "GNUnet 0.8     : "$2 (may conflict!)}'
+else
+  echo "GNUnet 0.8     : Not Found (good)"
+fi
+
+TEST=`$WHICH gnunet-arm 2>/dev/null`
+if test -n "$TEST"; then
+  gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
+    awk '{print "GNUnet 0.9     : "$2}'
+else
+  echo "GNUnet 0.9     : Not Found"
+fi
+
+TEST=`$WHICH libgcrypt-config 2> /dev/null`
+if test -n "$TEST"; then
+  libgcrypt-config --version 2> /dev/null | \
+    awk '{print "libgcrypt      : "$1}'
+else
+  echo "libgcrypt      : Not Found"
+fi
+
+TEST=`$WHICH mysql_config 2> /dev/null`
+if test -n "$TEST"; then
+  mysql_config --version 2> /dev/null | \
+    awk '{print "mysql          : "$1}'
+else
+  echo "mysql          : Not Found"
+fi
+
+TEST=`$WHICH pkg-config 2> /dev/null`
+if test -n "$TEST"; then
+  pkg-config --version 2> /dev/null | \
+    awk '{print "pkg-config     : "$1}'
+else
+  echo "pkg-config     : Not Found"
+fi
+
+TEST=`$WHICH pkg-config 2> /dev/null`
+if test -n "$TEST"; then
+  pkg-config --modversion glib-2.0 2> /dev/null | \
+    awk '{print "glib2          : "$1}'
+else
+  echo "glib2          : Not Found"
+fi
+
+TEST=`$WHICH pkg-config 2> /dev/null`
+if test -n "$TEST"; then
+  pkg-config --modversion gtk+-2.0 2> /dev/null | \
+    awk '{print "gtk2+          : "$1}'
+else
+  echo "gtk2+          : Not Found"
+fi
+
+TEST=`$WHICH dpkg 2> /dev/null`
+if test -n "$TEST"; then
+  LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null`
+  if test "$LINES" = "1"
+  then
+    VERSION=`dpkg -s libgmp-dev | grep Version | awk '{print $2}'`
+    echo "GMP            : libgmp-dev-$VERSION.deb"
+  else
+    echo "GMP            : dpkg: libgmp-dev not installed"
+  fi
+else
+  TEST=`$WHICH rpm 2> /dev/null`
+  if test -n "$TEST"; then
+    rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \
+      awk '{print "GMP            : "$1.rpm}'
+  else
+    echo "GMP            : Test not available"
+  fi
+fi
+
+TEST=`$WHICH dpkg 2> /dev/null`
+if test -n "$TEST"; then
+  LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
+  if test "$LINES" = "1"
+  then
+    VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
+    echo "libunistring   : libunistring3-dev-$VERSION.deb"
+  else
+    echo "libunistring   : dpkg: libunistring3-dev not installed"
+  fi
+else
+  TEST=`$WHICH rpm 2> /dev/null`
+  if test -n "$TEST"; then
+    rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
+      awk '{print "libunistring   : "$1.rpm}'
+  else
+    echo "libunistring   : Test not available"
+  fi
+fi
+
+TEST=`$WHICH gettext 2> /dev/null`
+if test -n "$TEST"; then
+  gettext --version | head -n1 2> /dev/null | \
+    awk '{print "GNU gettext    : "$4}'
+else
+  echo "GNU gettext    : Not found"
+fi
+
+
+TEST=`$WHICH curl-config 2> /dev/null`
+if test -n "$TEST"; then
+  curl-config --version | head -n1 2> /dev/null | \
+    awk '{print "libcurl        : "$2}'
+else
+  echo "libcurl        : Not found"
+fi
+
+TEST=`$WHICH gnurl-config 2> /dev/null`
+if test -n "$TEST"; then
+  gnurl-config --version | head -n1 2> /dev/null | \
+    awk '{print "libgnurl       : "$2}'
+else
+  echo "libgnurl       : Not found"
+fi
+
+echo -n "libmicrohttpd  : "
+TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <microhttpd.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%X\n", MHD_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
+echo -n "GNU GLPK       : "
+TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <glpk.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%u.%u\n", GLP_MAJOR_VERSION, GLP_MINOR_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
+echo -n "GNUtls         : "
+TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <gnutls/gnutls.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%s\n", GNUTLS_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
+echo "--------------------------------------------------------------"

diff --git a/contrib/scripts/report.sh b/contrib/scripts/report.sh
deleted file mode 100755 (executable)
index 7fbb2f4..0000000
--- a/contrib/scripts/report.sh
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/bin/sh
-
-TEST=`type type|grep not`
-if test -n "$TEST"; then
-  WHICH=which
-else
-  WHICH=type
-fi
-
-echo "Please submit the following information with your bug report: "
-echo "--------------------------------------------------------------"
-OS=`uname -s 2>/dev/null`
-echo "OS             : $OS"
-REL=`uname -r 2>/dev/null`
-echo "OS RELEASE     : $REL"
-HW=`uname -m 2>/dev/null`
-echo "HARDWARE       : $HW"
-
-TEST=`$WHICH gcc 2>/dev/null`
-if test -n "$TEST"; then
-  VERS=`gcc --version 2>/dev/null | head -n 1`
-  echo "gcc            : $VERS"
-else
-  echo "gcc            : Not Found";
-fi
-
-TEST=`$WHICH gmake 2>/dev/null`
-if test -n "$TEST" ; then
-       gmake --version 2>/dev/null |\
-               awk -F, '{print $1}' |\
-               awk '/GNU Make/{print "GNU gmake      :",$NF}'
-else
-  TEST=`make --version 2>/dev/null`
-  if test -n "$TEST"; then
-               make --version 2>/dev/null |\
-                       awk -F, '{print $1}' |\
-                       awk '/GNU Make/{print "make           :",$NF}'
-  else
-               echo "make           : Not Found"
-  fi
-fi
-
-TEST=`$WHICH autoconf 2>/dev/null`
-if test -n "$TEST"; then
-  autoconf --version |\
-    head -n 1 |\
-    awk '{\
-       if (length($4) == 0) {\
-               print "autoconf       : "$3\
-       } else {\
-               print "autoconf       : "$4\
-       }}'
-else
-  echo "autoconf       : Not Found"
-fi
-
-TEST=`$WHICH automake 2>/dev/null`
-if test -n "$TEST"; then
-  automake --version 2>/dev/null |\
-    head -n 1 |\
-    awk '{print "automake       : "$4}'
-else
-  echo "automake       : Not Found"
-fi
-
-TEST=`$WHICH libtool 2>/dev/null`
-if test -n "$TEST"; then
-  libtool --version 2>/dev/null |\
-    head -n 1 |\
-    awk '{print "libtool        : "$4}'
-else
-  echo "libtool        : Not Found"
-fi
-
-TEST=`$WHICH extract 2>/dev/null`
-if test -n "$TEST"; then
-  extract -v 2>/dev/null |\
-    head -n 1 |\
-    awk '{print "libextractor   : "$2}'
-else
-  echo "libextractor   : Not Found"
-fi
-
-if test -x gnunetd; then
-  gnunetd -v | sed -e "s/v//" 2>/dev/null |\
-    awk '{print "GNUnet 0.8     : "$2 (may conflict!)}'
-else
-  echo "GNUnet 0.8     : Not Found (good)"
-fi
-
-TEST=`$WHICH gnunet-arm 2>/dev/null`
-if test -n "$TEST"; then
-  gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
-    awk '{print "GNUnet 0.9     : "$2}'
-else
-  echo "GNUnet 0.9     : Not Found"
-fi
-
-TEST=`$WHICH libgcrypt-config 2> /dev/null`
-if test -n "$TEST"; then
-  libgcrypt-config --version 2> /dev/null | \
-    awk '{print "libgcrypt      : "$1}'
-else
-  echo "libgcrypt      : Not Found"
-fi
-
-TEST=`$WHICH mysql_config 2> /dev/null`
-if test -n "$TEST"; then
-  mysql_config --version 2> /dev/null | \
-    awk '{print "mysql          : "$1}'
-else
-  echo "mysql          : Not Found"
-fi
-
-TEST=`$WHICH pkg-config 2> /dev/null`
-if test -n "$TEST"; then
-  pkg-config --version 2> /dev/null | \
-    awk '{print "pkg-config     : "$1}'
-else
-  echo "pkg-config     : Not Found"
-fi
-
-TEST=`$WHICH pkg-config 2> /dev/null`
-if test -n "$TEST"; then
-  pkg-config --modversion glib-2.0 2> /dev/null | \
-    awk '{print "glib2          : "$1}'
-else
-  echo "glib2          : Not Found"
-fi
-
-TEST=`$WHICH pkg-config 2> /dev/null`
-if test -n "$TEST"; then
-  pkg-config --modversion gtk+-2.0 2> /dev/null | \
-    awk '{print "gtk2+          : "$1}'
-else
-  echo "gtk2+          : Not Found"
-fi
-
-TEST=`$WHICH dpkg 2> /dev/null`
-if test -n "$TEST"; then
-  LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null`
-  if test "$LINES" = "1"
-  then
-    VERSION=`dpkg -s libgmp-dev | grep Version | awk '{print $2}'`
-    echo "GMP            : libgmp-dev-$VERSION.deb"
-  else
-    echo "GMP            : dpkg: libgmp-dev not installed"
-  fi
-else
-  TEST=`$WHICH rpm 2> /dev/null`
-  if test -n "$TEST"; then
-    rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \
-      awk '{print "GMP            : "$1.rpm}'
-  else
-    echo "GMP            : Test not available"
-  fi
-fi
-
-TEST=`$WHICH dpkg 2> /dev/null`
-if test -n "$TEST"; then
-  LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
-  if test "$LINES" = "1"
-  then
-    VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
-    echo "libunistring   : libunistring3-dev-$VERSION.deb"
-  else
-    echo "libunistring   : dpkg: libunistring3-dev not installed"
-  fi
-else
-  TEST=`$WHICH rpm 2> /dev/null`
-  if test -n "$TEST"; then
-    rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
-      awk '{print "libunistring   : "$1.rpm}'
-  else
-    echo "libunistring   : Test not available"
-  fi
-fi
-
-TEST=`$WHICH gettext 2> /dev/null`
-if test -n "$TEST"; then
-  gettext --version | head -n1 2> /dev/null | \
-    awk '{print "GNU gettext    : "$4}'
-else
-  echo "GNU gettext    : Not found"
-fi
-
-
-TEST=`$WHICH curl-config 2> /dev/null`
-if test -n "$TEST"; then
-  curl-config --version | head -n1 2> /dev/null | \
-    awk '{print "libcurl        : "$2}'
-else
-  echo "libcurl        : Not found"
-fi
-
-TEST=`$WHICH gnurl-config 2> /dev/null`
-if test -n "$TEST"; then
-  gnurl-config --version | head -n1 2> /dev/null | \
-    awk '{print "libgnurl       : "$2}'
-else
-  echo "libgnurl       : Not found"
-fi
-
-echo -n "libmicrohttpd  : "
-TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
-cat - >$TMPFILE.c <<EOF
-#include <microhttpd.h>
-#include <stdio.h>
-int main()
-{
-  fprintf (stdout, "%X\n", MHD_VERSION);
-  return 0;
-}
-EOF
-
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
-
-
-echo -n "GNU GLPK       : "
-TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
-cat - >$TMPFILE.c <<EOF
-#include <glpk.h>
-#include <stdio.h>
-int main()
-{
-  fprintf (stdout, "%u.%u\n", GLP_MAJOR_VERSION, GLP_MINOR_VERSION);
-  return 0;
-}
-EOF
-
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
-
-
-echo -n "GNUtls         : "
-TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
-cat - >$TMPFILE.c <<EOF
-#include <gnutls/gnutls.h>
-#include <stdio.h>
-int main()
-{
-  fprintf (stdout, "%s\n", GNUTLS_VERSION);
-  return 0;
-}
-EOF
-
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
-
-
-echo "--------------------------------------------------------------"