Merge pull request #5025 from kamo-naoyuki/print

Use scripts/utils/print_args.sh instead of pyscripts/utils/print_args.py

egs2/TEMPLATE/asr1/asr.sh

@@ -273,7 +273,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then
@@ -309,7 +309,7 @@ for dset in ${test_sets}; do
         exit 1
     fi
     if [ "${dset}" = "${valid_set}" ]; then
-        log "Info: The valid_set ${valid_set} is included in the specified test_sets. Change to --eval_valid_set true and remove the ${valid_set} from the test_sets"
+        log "Info: The valid_set ${valid_set} is included in the test_sets. '--eval_valid_set true' is set and '${valid_set}' is removed from the test_sets"
         eval_valid_set=true
     elif contains "${dset}" "${_test_sets}"; then
         log "Info: ${dset} is duplicated in the test_sets. One is removed"

egs2/TEMPLATE/asr1/scripts/utils/print_args.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+extra_chars=(
+    ' '
+    ';'
+    '&'
+    '|'
+    '<'
+    '>'
+    '~'
+    '`'
+    '"'
+    ' '
+    '{'
+    '}'
+    '('
+    ')'
+)
+
+new_args=""
+for arg in "${@}"; do
+    if [[ ${arg} = *"'"* ]]; then
+        arg=$(echo "${arg}" | sed -e "s/'/'\\\\''/g")
+    fi
+
+    surround=false
+    if [[ ${arg} = *\** ]]; then
+        surround=true
+    elif [[ ${arg} = *\?* ]]; then
+        surround=true
+    elif [[ ${arg} = *\\* ]]; then
+        surround=true
+    else
+        for char in "${extra_chars[@]}"; do
+            if [[ ${arg} = *${char}* ]]; then
+                surround=true
+                break
+            fi
+        done
+    fi
+
+    if "${surround}"; then
+        new_args+="'${arg}' "
+    else
+        new_args+="${arg} "
+    fi
+done
+echo ${new_args}

egs2/TEMPLATE/diar1/diar.sh

@@ -139,7 +139,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/diar1/scripts/utils/print_args.sh

@@ -0,0 +1 @@
+../../../asr1/scripts/utils/print_args.sh

egs2/TEMPLATE/enh1/enh.sh

@@ -198,7 +198,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/enh1/scripts/utils/print_args.sh

@@ -0,0 +1 @@
+../../../asr1/scripts/utils/print_args.sh

egs2/TEMPLATE/enh_asr1/enh_asr.sh

@@ -265,7 +265,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/enh_asr1/scripts/utils/print_args.sh

@@ -0,0 +1 @@
+../../../asr1/scripts/utils/print_args.sh

egs2/TEMPLATE/enh_diar1/enh_diar.sh

@@ -156,7 +156,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/enh_diar1/scripts/utils/print_args.sh

@@ -0,0 +1 @@
+../../../asr1/scripts/utils/print_args.sh

egs2/TEMPLATE/enh_st1/enh_st.sh

@@ -286,7 +286,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/mt1/mt.sh

@@ -240,7 +240,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/slu1/slu.sh

@@ -237,7 +237,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/ssl1/hubert.sh

@@ -154,7 +154,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/st1/st.sh

@@ -261,7 +261,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/svs1/svs.sh

@@ -204,7 +204,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 

egs2/TEMPLATE/tts1/tts.sh

@@ -210,7 +210,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then

egs2/TEMPLATE/uasr1/scripts/utils/print_args.sh

@@ -0,0 +1 @@
+../../../asr1/scripts/utils/print_args.sh

egs2/TEMPLATE/uasr1/uasr.sh

@@ -296,7 +296,7 @@ EOF
 
 log "$0 $*"
 # Save command line args for logging (they will be lost after utils/parse_options.sh)
-run_args=$(pyscripts/utils/print_args.py $0 "$@")
+run_args=$(scripts/utils/print_args.sh $0 "$@")
 . utils/parse_options.sh
 
 if [ $# -ne 0 ]; then