use uppercase POSIX compliant signals for the 'trap' command

In 'man 1p trap' there is written:

    "Implementations may permit names with the SIG prefix or ignore case
    in signal names as an extension."

So change the lowercase signals to uppercase, which is POSIX compliant
instead of being an extension.

There wasn't anybody claiming that it doesn't work, but there was a bug
with using a signal with the SIG prefix, which is an extension as well.
So let's play it safe and change it, since it doesn't hurt anyone.

While at it, also convert 8 indentation spaces to 1 tab character.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Markus Heidelberg 2009-01-20 00:43:26 +01:00 коммит произвёл Junio C Hamano
Родитель bc08fc4e85
Коммит 35641310af
2 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -20,9 +20,9 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
if ! test -x "$LIB_HTTPD_PATH" if ! test -x "$LIB_HTTPD_PATH"
then then
say "skipping test, no web server found at '$LIB_HTTPD_PATH'" say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
test_done test_done
exit exit
fi fi
HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \ HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
@ -84,7 +84,7 @@ prepare_httpd() {
start_httpd() { start_httpd() {
prepare_httpd prepare_httpd
trap 'stop_httpd; die' exit trap 'stop_httpd; die' EXIT
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" $HTTPD_PARA \ -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
@ -92,7 +92,7 @@ start_httpd() {
} }
stop_httpd() { stop_httpd() {
trap 'die' exit trap 'die' EXIT
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" -k stop -f "$TEST_PATH/apache.conf" -k stop

Просмотреть файл

@ -127,7 +127,7 @@ fi
error () { error () {
say_color error "error: $*" say_color error "error: $*"
trap - exit trap - EXIT
exit 1 exit 1
} }
@ -163,7 +163,7 @@ die () {
exit 1 exit 1
} }
trap 'die' exit trap 'die' EXIT
# The semantics of the editor variables are that of invoking # The semantics of the editor variables are that of invoking
# sh -c "$EDITOR \"$@\"" files ... # sh -c "$EDITOR \"$@\"" files ...
@ -208,7 +208,7 @@ test_failure_ () {
say_color error "FAIL $test_count: $1" say_color error "FAIL $test_count: $1"
shift shift
echo "$@" | sed -e 's/^/ /' echo "$@" | sed -e 's/^/ /'
test "$immediate" = "" || { trap - exit; exit 1; } test "$immediate" = "" || { trap - EXIT; exit 1; }
} }
test_known_broken_ok_ () { test_known_broken_ok_ () {
@ -416,7 +416,7 @@ test_create_repo () {
} }
test_done () { test_done () {
trap - exit trap - EXIT
test_results_dir="$TEST_DIRECTORY/test-results" test_results_dir="$TEST_DIRECTORY/test-results"
mkdir -p "$test_results_dir" mkdir -p "$test_results_dir"
test_results_path="$test_results_dir/${0%-*}-$$" test_results_path="$test_results_dir/${0%-*}-$$"
@ -493,7 +493,7 @@ fi
test="trash directory.$(basename "$0" .sh)" test="trash directory.$(basename "$0" .sh)"
test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test" test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test"
rm -fr "$test" || { rm -fr "$test" || {
trap - exit trap - EXIT
echo >&5 "FATAL: Cannot prepare test area" echo >&5 "FATAL: Cannot prepare test area"
exit 1 exit 1
} }