diff --git a/data/pkgconfig.sh b/data/pkgconfig.sh index 0dba39f..61a50f6 100755 --- a/data/pkgconfig.sh +++ b/data/pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2011-2019 Pierre Pronchery +#Copyright (c) 2011-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -27,14 +27,15 @@ #variables CONFIGSH="${0%/pkgconfig.sh}/../config.sh" PREFIX="/usr/local" -DEBUG="_debug" DEVNULL="/dev/null" PROGNAME="pkgconfig.sh" #executables +DEBUG="_debug" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" SED="sed" + [ -f "$CONFIGSH" ] && . "$CONFIGSH" diff --git a/tests/clint.sh b/tests/clint.sh index 1bf833f..a7d22ba 100755 --- a/tests/clint.sh +++ b/tests/clint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/clint.sh}/../config.sh" CFLAGS= CPPFLAGS= PROGNAME="clint.sh" @@ -39,6 +40,8 @@ MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #clint diff --git a/tests/fixme.sh b/tests/fixme.sh index 1db1787..84319cf 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -25,17 +25,23 @@ #variables +CONFIGSH="${0%/fixme.sh}/../config.sh" PROGNAME="fixme.sh" PROJECTCONF="../project.conf" +REGEXP_ERROR="FIXME" +REGEXP_WARNING="\\(TODO\|XXX\\)" #executables DATE="date" DEBUG="_debug" FIND="find" GREP="grep" +HEAD="head" MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #fixme @@ -64,24 +70,7 @@ _fixme() for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f | $SORT); do - callback= - ext=${filename##*/} - ext=${ext%.in} - ext=${ext##*.} - case "$ext" in - asm|S) - callback="_fixme_asm" - ;; - c|cc|cpp|cxx|h|js) - callback="_fixme_c" - ;; - conf|sh) - callback="_fixme_sh" - ;; - htm|html|xml) - callback="_fixme_xml" - ;; - esac + callback=$(_fixme_callback "$filename") [ -n "$callback" ] || continue ($callback "$filename") 2>&1 if [ $? -ne 0 ]; then @@ -93,54 +82,114 @@ _fixme() return $res } -_fixme_asm() +_fixme_callback() +{ + filename="$1" + ext=${filename##*/} + ext=${ext%.in} + ext=${ext##*.} + callback= + + case "$ext" in + asm|S) + echo "_fixme_callback_asm" + return 0 + ;; + c|cc|cpp|cxx|h|js|v) + echo "_fixme_callback_c" + return 0 + ;; + conf|sh) + echo "_fixme_callback_sh" + return 0 + ;; + py) + echo "_fixme_callback_python" + return 0 + ;; + htm|html|xml|xsl) + echo "_fixme_callback_xml" + return 0 + ;; + esac + case $($HEAD -n 1 "$filename") in + "#!/bin/sh"*|"#! /bin/sh"*|\ + "#!/usr/bin/env bash"*|"#! /usr/bin/env bash"*) + echo "_fixme_callback_sh" + return 0 + ;; + "#!/usr/bin/env python"*|"#! /usr/bin/env python"*) + echo "_fixme_callback_python" + return 0 + ;; + "