From 041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 10 Jan 2012 15:41:10 -0800 Subject: merge_config.sh: use signal names compatible with dash and bash 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 Acked-by: John Stultz Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 890276b..b91015d 100644 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -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 [...]]" -- cgit v0.10.2