Merge branch 'master' into cpplint_style

egs/iban/s5/path.sh

@@ -1,10 +1,6 @@
-#!/bin/bash
-
 export KALDI_ROOT=`pwd`/../../..
-. $KALDI_ROOT/tools/config/common_path.sh
-
+[ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh
 export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH
-
-. $KALDI_ROOT/tools/env.sh
+[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1
+. $KALDI_ROOT/tools/config/common_path.sh
 export LC_ALL=C
-

egs/wsj/s5/steps/nnet2/decode.sh

@@ -151,7 +151,8 @@ if [ $stage -le 2 ]; then
     [ ! -x local/score.sh ] && \
       echo "Not scoring because local/score.sh does not exist or not executable." && exit 1;
     echo "score best paths"
-    local/score.sh --iter $iter $scoring_opts --cmd "$cmd" $data $graphdir $dir
+    [ "$iter" != "final" ] && iter_opt="--iter $iter"
+    local/score.sh $iter_opt $scoring_opts --cmd "$cmd" $data $graphdir $dir
     echo "score confidence and timing with sclite"
   fi
 fi

egs/wsj/s5/steps/nnet3/decode.sh

@@ -170,7 +170,8 @@ if [ $stage -le 2 ]; then
     [ ! -x local/score.sh ] && \
       echo "Not scoring because local/score.sh does not exist or not executable." && exit 1;
     echo "score best paths"
-    local/score.sh --iter $iter $scoring_opts --cmd "$cmd" $data $graphdir $dir
+    [ "$iter" != "final" ] && iter_opt="--iter $iter"
+    local/score.sh $iter_opt $scoring_opts --cmd "$cmd" $data $graphdir $dir
     echo "score confidence and timing with sclite"
   fi
 fi