merge_config.sh: use signal names compatible with dash and bash
authorDarren Hart <[email protected]>
Tue, 10 Jan 2012 23:41:10 +0000 (15:41 -0800)
committerMichal Marek <[email protected]>
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 <[email protected]>
Acked-by: John Stultz <[email protected]>
Cc: Michal Marek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
scripts/kconfig/merge_config.sh

index 890276bd1e672f886ee37a26e0808de10995a47f..b91015df96aa49c2fb28f4cd5a73f6d77f75b065 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 [...]]"