diff --git a/CHANGES.txt b/CHANGES.txt index 0530f280c8258b3f3639c921521f132325afa2f6..66b1b6df25cb2ecb099ad7e94d1cfd43a6c6fa54 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 0e841c8f7669dfb86f72b4e9fc3ba5f68d445523..52183675671b24e3ea3d43ad1be7afd559cf8356 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 fbde099db01fea9c8eedc26dc4efa5d984500c7f..bce58b904941125869220388e06f6ed69e29c7bd 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 a8d37871f1090f3ef6eecabc085a6dae357a6059..79ac102ba56c6f588c571ede5ba11eefa915d75b 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