merge_config.sh: use signal names compatible with dash and bash
authorDarren Hart <dvhart@linux.intel.com>
Tue, 10 Jan 2012 23:41:10 +0000 (15:41 -0800)
committerMichal Marek <mmarek@suse.cz>
Sat, 14 Jan 2012 20:44:29 +0000 (21:44 +0100)
The SIGHUP SIGINT and SIGTERM names caused failures when running
merge_config.sh with the dash shell.  Dropping the "SIG" component makes
the script work in both bash and dash.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

scripts/kconfig/merge_config.sh

index 890276b..b91015d 100644 (file)
@@ -24,7 +24,7 @@ clean_up() {
        rm -f $TMP_FILE
        exit
 }
-trap clean_up SIGHUP SIGINT SIGTERM
+trap clean_up HUP INT TERM
 
 usage() {
        echo "Usage: $0 [OPTIONS] [CONFIG [...]]"