From 270317db89e6f2f3cfd1e91a38638c09b6cea374 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 7 Jul 2009 16:22:36 +0200 Subject: [PATCH] small common.config cleanup Don't list various non-mandatory options near the check for the mandatory ones, and make the test for the mandatory ones a proper if statements. Signed-off-by: Christoph Hellwig Reviewed-by: Eric Sandeen --- common.config | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/common.config b/common.config index f8f8862d..15c7976e 100644 --- a/common.config +++ b/common.config @@ -191,27 +191,18 @@ known_hosts() [ -f $HOST_CONFIG_DIR/$HOST ] && . $HOST_CONFIG_DIR/$HOST [ -f $HOST_CONFIG_DIR/$HOST.config ] && . $HOST_CONFIG_DIR/$HOST.config + # Mandatory Config values. MC="" -# Non-Mandatory Config values. -# [ -z "$MODULAR" ] && MC="$MC MODULAR" -# [ -z "$TEST_LOGDEV" ] && MC="$MC TEST_LOGDEV" -# [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV" -# [ -z "$SCRATCH_RTDEV" ] && MC="$MC SCRATCH_RTDEV" -# [ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT" -# [ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV" - [ -z "$EMAIL" ] && MC="$MC EMAIL" [ -z "$TEST_DIR" ] && MC="$MC TEST_DIR" [ -z "$TEST_DEV" ] && MC="$MC TEST_DEV" - [ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\ - echo " or set variables:"; \ - echo " $MC") -# if [ -e configs/$HOST.config ] -# then echo "Not carring, we have a configfile ($HOST_CONFIG_DIR/$HOST)" -# else - [ "$MC" ] && exit 1 -# fi + if [ -n "$MC" ]; then + echo "Warning: need to define parameters for host $HOST" + echo " or set variables:" + echo " $MC" + exit 1 + fi } if [ -f "$HOST_OPTIONS" ]; then -- 2.39.5