Commit 7e99f07935f9f6faf761804e0460c57be3a0ffa5
1 parent
f37e72eafc
Exists in
master
up
Showing 3 changed files with 12 additions and 8 deletions Side-by-side Diff
main_tools/ExploitConfidencePass.sh
| ... | ... | @@ -15,7 +15,6 @@ |
| 15 | 15 | |
| 16 | 16 | echo "### ExploitConfidencePass.sh ###" |
| 17 | 17 | |
| 18 | - | |
| 19 | 18 | # Check OTMEDIA_HOME env var |
| 20 | 19 | if [ -z ${OTMEDIA_HOME} ] |
| 21 | 20 | then |
| ... | ... | @@ -78,7 +77,7 @@ |
| 78 | 77 | RERUN=1 |
| 79 | 78 | ;; |
| 80 | 79 | :) |
| 81 | - echo "Option -$OPTARG requires an argument." >&2 | |
| 80 | + echo "Option -$OPTARG requires an argument." > /dev/stderr | |
| 82 | 81 | exit 1 |
| 83 | 82 | ;; |
| 84 | 83 | \?) |
| 85 | 84 | |
| ... | ... | @@ -136,11 +135,12 @@ |
| 136 | 135 | { |
| 137 | 136 | RES_CONF_DIR=$(cat $CONFPASS_CONFIG_FILE | grep "^RES_CONF_DIR=" | cut -f2 -d"=") |
| 138 | 137 | RES_CONF=$(cat $CONFPASS_CONFIG_FILE | grep "^CONF_DIR=" | cut -f2 -d"=") |
| 139 | - print_warn "[${BASENAME}] Use confidence measure from : $RES_CONF" 1 | |
| 138 | + print_info "[${BASENAME}] Use confidence measure from : $RES_CONF" 2 | |
| 140 | 139 | } |
| 141 | 140 | else |
| 142 | 141 | { |
| 143 | - print_error "Can't find $CONFPASS_CONFIG_FILE" 1 | |
| 142 | + print_error "[${BASENAME}] Can't find $CONFPASS_CONFIG_FILE" | |
| 143 | + print_error "[${BASENAME}] -> use res_p2" | |
| 144 | 144 | RES_CONF_DIR="$INPUT_DIR/conf/res_p2/scored_ctm" |
| 145 | 145 | RES_CONF="$INPUT_DIR/conf/res_p2" |
| 146 | 146 | } |
| ... | ... | @@ -155,7 +155,11 @@ |
| 155 | 155 | # Create Workspace # |
| 156 | 156 | #------------------# |
| 157 | 157 | # Lock directory |
| 158 | -if [ -e "$OUTPUT_DIR_BASENAME/EXPLOITCONFPASS.lock" ] && [ $RERUN -eq 0 ]; then exit 1; fi | |
| 158 | +if [ -e "$OUTPUT_DIR_BASENAME/EXPLOITCONFPASS.lock" ] && [ $RERUN -eq 0 ] | |
| 159 | +then | |
| 160 | + print_warn "[${BASENAME}] ExploitConfidencePass is locked -> exit" 2 | |
| 161 | + exit 1 | |
| 162 | +fi | |
| 159 | 163 | rm "$OUTPUT_DIR/EXPLOITCONFPASS.unlock" > /dev/null 2>&1 |
| 160 | 164 | touch "$OUTPUT_DIR/EXPLOITCONFPASS.lock" > /dev/null 2>&1 |
| 161 | 165 | |
| ... | ... | @@ -167,7 +171,7 @@ |
| 167 | 171 | echo "TRIGGER_SPEERAL=$TRIGGER_CONFZONE/speeral/" >> $OUTPUT_DIR/ExploitConfPass.cfg |
| 168 | 172 | echo "LEX_SPEERAL=$EXT_LEX/speeral/${lexname}_ext" >> $OUTPUT_DIR/ExploitConfPass.cfg |
| 169 | 173 | echo "LEX_BINODE_SPEERAL=$EXT_LEX/speeral/${lexname}_ext.bin" >> $OUTPUT_DIR/ExploitConfPass.cfg |
| 170 | - | |
| 174 | +print_info "[${BASENAME}] Save config in $OUTPUT_DIR_BASENAME/ExploitConfPass.cfg" 1 | |
| 171 | 175 | |
| 172 | 176 | #-----------------------# |
| 173 | 177 | # Segmentation by show # |
main_tools/OneScriptToRuleThemAll.sh