From 9b000d3c61849cd9eacf22b2645ea312e895c43d Mon Sep 17 00:00:00 2001
From: Karl-Hermann Wieners <karl-hermann.wieners@mpimet.mpg.de>
Date: Fri, 13 Oct 2017 11:52:26 +0000
Subject: [PATCH] Fixed descriptive message for cpexp; fixed error handling for
rmexp, cpexp, diffexp; minor edits
---
CHANGES.txt | 3 ++-
cpexp | 7 ++++---
diffexp | 6 ++++--
rmexp | 4 +++-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 0530f28..66b1b6d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,7 +12,8 @@ Release 1.0.0
Global
------
-* Fixed descriptive message for getexp
+* Fixed error handling for rmexp, cpexp, diffexp; minor edits
+* Fixed descriptive message for getexp, cpexp
* Added --version option to mkexp
* Changed rmexp to remove empty parent directories
* Changed rmexp to remove monitoring data
diff --git a/cpexp b/cpexp
index 0e841c8..5218367 100755
--- a/cpexp
+++ b/cpexp
@@ -15,16 +15,17 @@ die () {
}
[ "x$2" = x ] && die "Oops: invalid number of parameters
-Usage: $PROGRAM config_a new_exp_id [key=value...]"
+Usage: $PROGRAM config_file new_exp_id [key=value...]"
CONFIG_A=$1
EXP_B=$2
shift; shift
-eval `getexp -v "$CONFIG_A" "$@" || echo \; exit $?`
+eval `getexp -v "$CONFIG_A" "$@" || echo '
+' exit $?`
EXP_A=$EXP_ID
-set $SCRIPT_DIR $WORK_DIR $RESTART_DIR $DATA_DIR $LOG_DIR $MON_DIR/$EXP_A ### $MON_DIR/index.html
+set $SCRIPT_DIR $WORK_DIR $RESTART_DIR $DATA_DIR $LOG_DIR $MON_DIR/$EXP_A ### $MON_DIR/index.html
for PATH_A
do
cppath "$EXP_A" "$EXP_B" "$PATH_A"
diff --git a/diffexp b/diffexp
index fbde099..bce58b9 100755
--- a/diffexp
+++ b/diffexp
@@ -21,11 +21,13 @@ CONFIG_A=$1
CONFIG_B=$2
shift; shift
-eval `getexp "$CONFIG_A" "$@" || echo \; exit $?`
+eval `getexp "$CONFIG_A" "$@" || echo '
+' exit $?`
EXP_A=$EXP_ID
PATH_A=$SCRIPT_DIR
-eval `getexp "$CONFIG_B" "$@" || echo \; exit $?`
+eval `getexp "$CONFIG_B" "$@" || echo '
+' exit $?`
EXP_B=$EXP_ID
PATH_B=$SCRIPT_DIR
diff --git a/rmexp b/rmexp
index a8d3787..79ac102 100755
--- a/rmexp
+++ b/rmexp
@@ -20,7 +20,8 @@ Usage: $PROGRAM config_file [key=value...]"
CONFIG=$1
shift
-eval `getexp -v "$CONFIG" "$@" || echo \; exit $?`
+eval `getexp -v "$CONFIG" "$@" || echo '
+' exit $?`
ask_and_remove () {
label="$1"
@@ -51,3 +52,4 @@ ask_and_remove script $SCRIPT_DIR
ask_and_remove log $LOG_DIR
ask_and_remove data $DATA_DIR
ask_and_remove monitoring $MON_DIR/$EXP_ID
+### $MON_DIR/index.html
--
GitLab