aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/scripts/gnunet-bugreport38
1 files changed, 20 insertions, 18 deletions
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
index 203981ad5..6759c21c0 100755
--- a/contrib/scripts/gnunet-bugreport
+++ b/contrib/scripts/gnunet-bugreport
@@ -6,6 +6,7 @@
6# - Do we need to set awk to which awk becomes available or is awk 6# - Do we need to set awk to which awk becomes available or is awk
7# always available as just awk? 7# always available as just awk?
8# 8#
9# Dedicated to the Public Domain.
9# SPDX-License-Identifier: 0BSD 10# SPDX-License-Identifier: 0BSD
10 11
11progname=${0##*/} 12progname=${0##*/}
@@ -206,10 +207,13 @@ libextractor_check()
206{ 207{
207 TEST=`type extract | awk '/not found/' 2>/dev/null` 208 TEST=`type extract | awk '/not found/' 2>/dev/null`
208 if test -z "$TEST"; then 209 if test -z "$TEST"; then
209 VER=`extract -v 2>/dev/null | head -n 1 | awk '{print $2}'` 210 TEST=`strings $(type extract | awk '{print $NF}') | awk '/EXTRACTOR_extract/' 2>/dev/null`
210 infomsg "libextractor : $VER" 211 if test -n "$TEST"; then
211 else 212 VER=`extract -v 2>/dev/null | awk '{gsub("v",""); print $NF}'`
212 warningmsg "libextractor : Not Found" 213 infomsg "libextractor : $VER"
214 else
215 warningmsg "libextractor : Not Found"
216 fi
213 fi 217 fi
214} 218}
215 219
@@ -241,7 +245,7 @@ gnunet_version_check()
241 245
242gitcommit_check() 246gitcommit_check()
243{ 247{
244 TEST=$(git | awk '/not found/' 2> /dev/null) 248 TEST=$(type git | awk '/not found/' 2> /dev/null)
245 if test -z "$TEST"; then 249 if test -z "$TEST"; then
246 VER=$(git rev-parse HEAD) 250 VER=$(git rev-parse HEAD)
247 infomsg "git commit : $VER" 251 infomsg "git commit : $VER"
@@ -419,28 +423,27 @@ gettext_check()
419 fi 423 fi
420} 424}
421 425
422# Merge curl_check + gnurl_check -> error if neither is 426gnurl_curl_check()
423# found (yes those systems exist)
424curl_check()
425{ 427{
426 TEST=`type curl-config | awk '/not found/' 2> /dev/null` 428 TESTCURL=`type curl-config | awk '/not found/' 2> /dev/null`
427 if test -z "$TEST"; then 429 if test -z "$TESTCURL"; then
428 VER=`curl-config --version 2> /dev/null | awk '{print $NF}'` 430 VER=`curl-config --version 2> /dev/null | awk '{print $NF}'`
429 infomsg "libcurl : $VER" 431 infomsg "libcurl : $VER"
430 else 432 else
431 infomsg "libcurl : Not found" 433 infomsg "libcurl : Not found"
432 fi 434 fi
433}
434 435
435gnurl_check() 436 TESTGNURL=`type gnurl-config | awk '/not found/' 2> /dev/null`
436{ 437 if test -z "$TESTGNURL"; then
437 TEST=`type gnurl-config | awk '/not found/' 2> /dev/null` 438 VER=`gnurl-config --version 2>&1 /dev/null | awk '{print $NF}'`
438 if test -z "$TEST"; then
439 VER=`gnurl-config --version 2> /dev/null | awk '{print $NF}'`
440 infomsg "libgnurl : $VER" 439 infomsg "libgnurl : $VER"
441 else 440 else
442 infomsg "libgnurl : Not found" 441 infomsg "libgnurl : Not found"
443 fi 442 fi
443
444 if test -z "$TESTCURL" -a "$TESTGNURL"; then
445 warningmsg "libgnurl or libcurl : Not found"
446 fi
444} 447}
445 448
446libmicrohttpd_check() 449libmicrohttpd_check()
@@ -560,8 +563,7 @@ main()
560 libunistring_check 563 libunistring_check
561 gnugettext_check 564 gnugettext_check
562 gettext_check 565 gettext_check
563 curl_check 566 gnurl_curl_check
564 gnurl_check
565 libmicrohttpd_check 567 libmicrohttpd_check
566 glpk_check 568 glpk_check
567 gnutls_check 569 gnutls_check