From f3043a8b949ebc79be54053c83fe110e9fedc59c Mon Sep 17 00:00:00 2001 From: rey jean-Francois Date: Fri, 2 Aug 2013 10:53:10 +0200 Subject: [PATCH] bugfix --- main_tools/ConfPass.sh | 6 +++--- main_tools/ExploitConfidencePass.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main_tools/ConfPass.sh b/main_tools/ConfPass.sh index 91dfe35..e548a88 100755 --- a/main_tools/ConfPass.sh +++ b/main_tools/ConfPass.sh @@ -207,8 +207,8 @@ print_info "[${BASENAME}] Save config in $OUTPUT_DIR_BASENAME/ConfPass.cfg" 1 #--------------------# # Check pourcentage of scored_ctm already done, if < 85% do confidence measure -nbres_p=$(ls ${RES_P}/*.treil | wc -l) -nbconf=$(ls ${RES_CONF_DIR}/*.res | wc -l) +nbres_p=$(ls ${RES_P}/*.treil 2> /dev/null | wc -l) +nbconf=$(ls ${RES_CONF_DIR}/*.res 2> /dev/null | wc -l) if [ $nbres_p -gt 0 ] then pourcentageres=$((($nbconf*100)/$nbres_p)) @@ -225,7 +225,7 @@ fi ### Check scored_ctm number res files ! if [ $CHECK -eq 1 ] then - nbconf=$(ls ${RES_CONF_DIR}/*.res | wc -l) + nbconf=$(ls ${RES_CONF_DIR}/*.res 2> /dev/null | wc -l) if [ $nbres_p -ne $nbconf ] then print_warn "WARN : ConfPass $INPUT_DIR/$RES_NAME number of res files differ" 2 diff --git a/main_tools/ExploitConfidencePass.sh b/main_tools/ExploitConfidencePass.sh index a6d71cf..3fc760f 100755 --- a/main_tools/ExploitConfidencePass.sh +++ b/main_tools/ExploitConfidencePass.sh @@ -178,7 +178,7 @@ print_info "[${BASENAME}] Save config in $OUTPUT_DIR_BASENAME/ExploitConfPass.cf if [ $( ${RES_CONf_DIR}/*.res 2> /dev/null | wc -l) -eq 0 ] then print_error "[${BASENAME}] No Conf Pass res -> exit ExploitConfPass" - if [ $CHECK -eq 1 ]; then print_log_file $ERRORFILE "No ConfPass res in $[RES_CONf_DIR}" ;fi + if [ $CHECK -eq 1 ]; then print_log_file $ERRORFILE "No ConfPass res in ${RES_CONf_DIR}" ;fi exit 1 fi -- 1.8.2.3