diff options
author | ng0 <ng0@n0.is> | 2019-11-21 11:44:11 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-21 11:44:11 +0000 |
commit | b84b4448cf4fbbbfae7527edb3973e408d525da3 (patch) | |
tree | e785ef52ec2f42bddcb77cc41b107cdd6c50c6e4 /contrib/scripts | |
parent | d31342702e4128aac7dc9c3ac85f856868fbd479 (diff) | |
download | gnunet-b84b4448cf4fbbbfae7527edb3973e408d525da3.tar.gz gnunet-b84b4448cf4fbbbfae7527edb3973e408d525da3.zip |
fix some tests in gnunet-bugreport
Diffstat (limited to 'contrib/scripts')
-rwxr-xr-x | contrib/scripts/gnunet-bugreport | 88 |
1 files changed, 63 insertions, 25 deletions
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport index 928438ad6..a63b816ef 100755 --- a/contrib/scripts/gnunet-bugreport +++ b/contrib/scripts/gnunet-bugreport | |||
@@ -94,23 +94,47 @@ cplusplus_check() | |||
94 | fi | 94 | fi |
95 | } | 95 | } |
96 | 96 | ||
97 | clang_check() | ||
98 | { | ||
99 | TEST=`$WHICH clang | grep -v "not found" 2>/dev/null` | ||
100 | if test -n "$TEST"; then | ||
101 | VERS=`clang --version 2>/dev/null | head -n 1` | ||
102 | infomsg "clang : $VERS" | ||
103 | elif test -n "`clang 2>&1 | tail -1 | awk '{print $1}'`"; then | ||
104 | VERS=`clang --version 2>/dev/null | head -n 1` | ||
105 | infomsg "clang : $VERS" | ||
106 | else | ||
107 | warningmsg "clang : Not Found"; | ||
108 | fi | ||
109 | } | ||
110 | |||
111 | clangplusplus_check() | ||
112 | { | ||
113 | TEST=`$WHICH clang++ | grep -v "not found" 2>/dev/null` | ||
114 | if test -n "$TEST"; then | ||
115 | VERS=`clang++ --version 2>/dev/null | head -n 1` | ||
116 | infomsg "clang++ : $VERS" | ||
117 | elif test -n "`clang++ 2>&1 | tail -1 | awk '{print $1}'`"; then | ||
118 | VERS=`clang++ --version 2>/dev/null | head -n 1` | ||
119 | infomsg "clang++ : $VERS" | ||
120 | else | ||
121 | warningmsg "clang++ : Not Found"; | ||
122 | fi | ||
123 | } | ||
124 | |||
97 | gmake_check() | 125 | gmake_check() |
98 | { | 126 | { |
99 | TEST=`$WHICH gmake | grep -v "not found" 2>/dev/null` | 127 | TEST=`$WHICH gmake | grep -v "not found" 2>/dev/null` |
100 | if test -n "$TEST" ; then | 128 | if test -n "$TEST" ; then |
101 | VER=`gmake --version 2>/dev/null |\ | 129 | VER=$(gmake --version 2>/dev/null | awk '/GNU Make/ {print $3}') |
102 | awk -F, '{print $1}' |\ | 130 | infomsg "gmake : $VER" |
103 | awk '/GNU Make/{,$NF}'` | ||
104 | infomsg "gmake : $VER" | ||
105 | else | 131 | else |
106 | TEST=`make --version 2>/dev/null` | 132 | TEST=`make --version 2>/dev/null` |
107 | if test -n "$TEST"; then | 133 | if test -n "$TEST"; then |
108 | VER=`make --version 2>/dev/null |\ | 134 | VER=$(make --version 2>/dev/null | awk '/GNU Make/ {print $3}') |
109 | awk -F, '{print $1}' |\ | 135 | infomsg "gmake : $VER" |
110 | awk '/GNU Make/{print $NF}'` | ||
111 | infomsg "gmake : $VER" | ||
112 | else | 136 | else |
113 | warningmsg "gmake : Not Found" | 137 | warningmsg "gmake : Not Found" |
114 | fi | 138 | fi |
115 | fi | 139 | fi |
116 | } | 140 | } |
@@ -255,7 +279,7 @@ pkgconf_check() | |||
255 | { | 279 | { |
256 | TEST=`$WHICH pkgconf | grep -v "not found" 2> /dev/null` | 280 | TEST=`$WHICH pkgconf | grep -v "not found" 2> /dev/null` |
257 | if test -n "$TEST"; then | 281 | if test -n "$TEST"; then |
258 | pkgconf --version 2> /dev/null | awk '{print "pkgconf : "$1}' | 282 | pkgconf --version 2> /dev/null | awk '{print " INFO: pkgconf : "$1}' |
259 | else | 283 | else |
260 | infomsg "pkgconf : Not Found" | 284 | infomsg "pkgconf : Not Found" |
261 | fi | 285 | fi |
@@ -346,7 +370,14 @@ gmp_check() | |||
346 | rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \ | 370 | rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \ |
347 | infomsg "GMP : $1.rpm" | 371 | infomsg "GMP : $1.rpm" |
348 | else | 372 | else |
349 | warningmsg "GMP : Test not available" | 373 | infomsg "GMP : Test not available" |
374 | fi | ||
375 | TEST=$($WHICH pkg_info | grep -v "not found" 2> /dev/null) | ||
376 | if test -n "$TEST"; then | ||
377 | VER=$(pkg_info -e gmp) | ||
378 | infomsg "GMP : $VER" | ||
379 | else | ||
380 | infomsg "GMP : Test not available" | ||
350 | fi | 381 | fi |
351 | fi | 382 | fi |
352 | } | 383 | } |
@@ -371,30 +402,35 @@ libunistring_check() | |||
371 | else | 402 | else |
372 | infomsg "libunistring : Test not available" | 403 | infomsg "libunistring : Test not available" |
373 | fi | 404 | fi |
405 | TEST=$($WHICH pkg_info | grep -v "not found" 2> /dev/null) | ||
406 | if test -n "$TEST"; then | ||
407 | VER=$(pkg_info -e libunistring) | ||
408 | infomsg "libunistring : $VER" | ||
409 | else | ||
410 | infomsg "libunistring : Test not available" | ||
411 | fi | ||
374 | fi | 412 | fi |
375 | } | 413 | } |
376 | 414 | ||
377 | pkgadd_check() | 415 | gnugettext_check() |
378 | { | 416 | { |
379 | TEST=`$WHICH pkg_add | grep -v "not found" 2> /dev/null` | 417 | TEST=`$WHICH gettext | grep -v "not found" 2> /dev/null` |
380 | if test -n "$TEST"; then | 418 | if test -n "$TEST"; then |
381 | VERSION_UNISTRING=`pkg_info -Nb libunistring` | 419 | if test -n "$(gettext --version 2>&1 | awk '/unknown option/')"; then |
382 | VERSION_GMP=`pkg_info -Nb gmp` | 420 | infomsg "GNU gettext : Not found" |
383 | echo "libunistring :" | 421 | else |
384 | echo "$VERSION_UNISTRING" | 422 | VER=`gettext --version | awk '/GNU gettext/ {print $4}'` |
385 | echo "GMP :" | 423 | infomsg "GNU gettext : $VER" |
386 | echo "$VERSION_GMP" | 424 | fi |
387 | fi | 425 | fi |
388 | } | 426 | } |
389 | 427 | ||
390 | gettext_check() | 428 | gettext_check() |
391 | { | 429 | { |
392 | TEST=`$WHICH gettext | grep -v "not found" 2> /dev/null` | 430 | if test -n "`$WHICH getext 2>/dev/null`"; then |
393 | if test -n "$TEST"; then | 431 | infomsg "gettext : Found" |
394 | VER=`gettext --version | head -n1 2> /dev/null | awk '{print $4}'` | ||
395 | infomsg "GNU gettext : $VER" | ||
396 | else | 432 | else |
397 | errormsg "GNU gettext : Not found" | 433 | infomsg "gettext : Not Found" |
398 | fi | 434 | fi |
399 | } | 435 | } |
400 | 436 | ||
@@ -491,6 +527,8 @@ main() | |||
491 | gcc_check | 527 | gcc_check |
492 | cc_check | 528 | cc_check |
493 | cplusplus_check | 529 | cplusplus_check |
530 | clang_check | ||
531 | clangplusplus_check | ||
494 | gmake_check | 532 | gmake_check |
495 | make_check | 533 | make_check |
496 | autoconf_check | 534 | autoconf_check |
@@ -511,7 +549,7 @@ main() | |||
511 | gtk4_check | 549 | gtk4_check |
512 | gmp_check | 550 | gmp_check |
513 | libunistring_check | 551 | libunistring_check |
514 | pkgadd_check | 552 | gnugettext_check |
515 | gettext_check | 553 | gettext_check |
516 | curl_check | 554 | curl_check |
517 | gnurl_check | 555 | gnurl_check |