mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-15 18:08:30 -07:00
Pull request: scrips: make go-lint show output even when command fails
Merge in DNS/adguard-home from imp-go-lint to master Squashed commit of the following: commit 4ac92d95071b747e01e30713030e72396f1c353f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 20:35:35 2021 +0300 scrips: make go-lint show output even when command fails
This commit is contained in:
parent
fc9ddcf941
commit
a76fb2cd52
@ -60,14 +60,24 @@ underscores() {
|
||||
|
||||
# exit_on_output exits with a nonzero exit code if there is anything in
|
||||
# the command's combined output.
|
||||
exit_on_output() {
|
||||
test "$VERBOSE" -lt '2' && set +x
|
||||
exit_on_output() (
|
||||
set +e
|
||||
|
||||
if [ "$VERBOSE" -lt '2' ]
|
||||
then
|
||||
set +x
|
||||
fi
|
||||
|
||||
cmd="$1"
|
||||
shift
|
||||
|
||||
exitcode='0'
|
||||
output="$("$cmd" "$@" 2>&1)"
|
||||
exitcode="$?"
|
||||
if [ "$exitcode" != '0' ]
|
||||
then
|
||||
echo "'$cmd' failed with code $exitcode"
|
||||
fi
|
||||
|
||||
if [ "$output" != '' ]
|
||||
then
|
||||
if [ "$*" != '' ]
|
||||
@ -79,13 +89,14 @@ exit_on_output() {
|
||||
|
||||
echo "$output"
|
||||
|
||||
exitcode='1'
|
||||
if [ "$exitcode" = '0' ]
|
||||
then
|
||||
exitcode='1'
|
||||
fi
|
||||
fi
|
||||
|
||||
test "$VERBOSE" -gt '0' && set -x
|
||||
|
||||
return "$exitcode"
|
||||
}
|
||||
)
|
||||
|
||||
exit_on_output blocklist_imports
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user