Commit 6db49dab669240bb1584c51a8979070935faee2b
1 parent
630a18786e
Exists in
master
bugfix arguments
Showing 3 changed files with 13 additions and 13 deletions Side-by-side Diff
main_tools/ConfPass.sh
main_tools/OneScriptToRuleThemAll.sh
| ... | ... | @@ -65,7 +65,7 @@ |
| 65 | 65 | #---------------# |
| 66 | 66 | # Parse Options # |
| 67 | 67 | #---------------# |
| 68 | -while getopts ":hDv:cf:r123CeRsa" opt | |
| 68 | +while getopts ":hDv:cf:r123C:eRsa" opt | |
| 69 | 69 | do |
| 70 | 70 | case $opt in |
| 71 | 71 | h) |
| ... | ... | @@ -81,7 +81,7 @@ |
| 81 | 81 | echo -e "\t\t-1 :\tDo 1rt pass" |
| 82 | 82 | echo -e "\t\t-2 :\tDo 2nd pass" |
| 83 | 83 | echo -e "\t\t-3 :\tDo 3rd pass" |
| 84 | - echo -e "\t\t-C :\tDo confidence pass" | |
| 84 | + echo -e "\t\t-C p :\tDo p confidence pass (1=all, 2 or 3)" | |
| 85 | 85 | echo -e "\t\t-e :\tDo exploit confidence pass (SOLR)" |
| 86 | 86 | echo -e "\t\t-R :\tDo recompose res" |
| 87 | 87 | echo -e "\t\t-s :\tDo scoring" |
| ... | ... | @@ -97,7 +97,7 @@ |
| 97 | 97 | RING=$RING" -c" |
| 98 | 98 | ;; |
| 99 | 99 | f) |
| 100 | - RING=$RING" -f $OPTARG" | |
| 100 | + FORKS=" -f $OPTARG" | |
| 101 | 101 | ;; |
| 102 | 102 | r) |
| 103 | 103 | RING=$RING" -r" |
| ... | ... | @@ -121,7 +121,7 @@ |
| 121 | 121 | p3=1 |
| 122 | 122 | ;; |
| 123 | 123 | C) |
| 124 | - conf=1 | |
| 124 | + conf=$OPTARG | |
| 125 | 125 | ;; |
| 126 | 126 | e) |
| 127 | 127 | exploitconf=1 |
| 128 | 128 | |
| ... | ... | @@ -157,12 +157,12 @@ |
| 157 | 157 | then |
| 158 | 158 | echo -e "$LORD\n" |
| 159 | 159 | REP_OUT=$2/$(basename ${1%.*}) |
| 160 | - if [ $p1 -eq 1 ];then ${MAIN_SCRIPT_PATH}/FirstPass.sh ${RING} $1 $2;fi | |
| 161 | - if [ $p2 -eq 1 ];then ${MAIN_SCRIPT_PATH}/SecondPass.sh ${RING} ${REP_OUT};fi | |
| 162 | - if [ $conf -eq 1 ];then $p${MAIN_SCRIPT_PATH}/ConfPass.sh ${RING} ${REP_OUT} "res_p2";fi | |
| 160 | + if [ $p1 -eq 1 ];then ${MAIN_SCRIPT_PATH}/FirstPass.sh ${RING} ${FORKS} $1 $2;fi | |
| 161 | + if [ $p2 -eq 1 ];then ${MAIN_SCRIPT_PATH}/SecondPass.sh ${RING} ${FORKS} ${REP_OUT};fi | |
| 162 | + if [ $conf -eq 1 ] || [ $conf -eq 2 ];then $p${MAIN_SCRIPT_PATH}/ConfPass.sh ${RING} ${REP_OUT} "res_p2";fi | |
| 163 | 163 | if [ $exploitconf -eq 1 ]; then ${MAIN_SCRIPT_PATH}/ExploitConfidencePass.sh ${RING} ${REP_OUT};fi |
| 164 | - if [ $p3 -eq 1 ];then ${MAIN_SCRIPT_PATH}/ThirdPass.sh ${RING} ${REP_OUT};fi | |
| 165 | - if [ $conf -eq 1 ];then ${MAIN_SCRIPT_PATH}/ConfPass.sh ${RING} ${REP_OUT} "res_p3";fi | |
| 164 | + if [ $p3 -eq 1 ];then ${MAIN_SCRIPT_PATH}/ThirdPass.sh ${RING} ${FORKS} ${REP_OUT};fi | |
| 165 | + if [ $conf -eq 1 ] || [ $conf -eq 3 ];then ${MAIN_SCRIPT_PATH}/ConfPass.sh ${RING} ${REP_OUT} "res_p3";fi | |
| 166 | 166 | if [ $recompose -eq 1 ];then ${MAIN_SCRIPT_PATH}/RecomposePass.sh ${RING} ${REP_OUT};fi |
| 167 | 167 | if [ $scoring -eq 1 ];then ${MAIN_SCRIPT_PATH}/ScoringRes.sh ${RING} ${REP_OUT};fi |
| 168 | 168 | echo "done" |
tools/scripts/CheckSecondPass.sh
| ... | ... | @@ -20,9 +20,9 @@ |
| 20 | 20 | if [ $# -eq 2 ] |
| 21 | 21 | then |
| 22 | 22 | if [ ! -e "$1" ] || [ -z "$1" ]; then return 1; fi |
| 23 | - FILENBSEG=$(ls "$2/*.seg" | grep -f "$1" | wc -l) | |
| 24 | - FILENBRES=$(ls "$2/*.res" | grep -f "$1" | wc -l) | |
| 25 | - FILENBTREIL=$(ls "$2/*.treil" | grep -f "$1" | wc -l) | |
| 23 | + FILENBSEG=$(ls "$2/*.seg" 2> /dev/null | grep -f "$1" | wc -l) | |
| 24 | + FILENBRES=$(ls "$2/*.res" 2> /dev/null | grep -f "$1" | wc -l) | |
| 25 | + FILENBTREIL=$(ls "$2/*.treil" 2 /dev/null | grep -f "$1" | wc -l) | |
| 26 | 26 | FILENB=$(cat "$1" | wc -l) |
| 27 | 27 | if [ $FILENB -ne $FILENBSEG ] || [ $FILENB -ne $FILENBRES ] || [ $FILENB -ne $FILENBTREIL ] ; then return 1;fi |
| 28 | 28 | fi |