diff --git a/highbeam b/highbeam index a46a4e7..98b4be9 100755 --- a/highbeam +++ b/highbeam @@ -69,7 +69,6 @@ BW="${E}47m" # lines U="${E}4m" - CONF_FILE=~/.highbeamrc CONF_LINE="" FLAGS="ig" @@ -100,23 +99,23 @@ done exit 1 } } - for (( r=0; r<${#RULES[@]}; r++ )); - do REGEX="$REGEX -e 's/\(${RULES[$r]}\)/${RULES[$(( $r + 1 ))]}\1${Z}/${FLAGS}'" - r=$(( $r + 1 )) + for (( rIndex=0; rIndex<${#RULES[@]}; rIndex++ )); + do REGEX="$REGEX -e 's/\(${RULES[$r]}\)/${RULES[$(( $rIndex + 1 ))]}\1${Z}/${FLAGS}'" + rIndex=$(( $rIndex + 1 )) done } || { # string fed rules - for (( r=0; r<${#CONF_LINE[@]}; r++ )); - do REGEX="$REGEX -e 's/\(${CONF_LINE[$r]}\)/${CONF_LINE[$(( $r + 1 ))]}\1${Z}/${FLAGS}'" - r=$(( $r + 1 )) + for (( rIndex=0; rIndex<${#CONF_LINE[@]}; rIndex++ )); + do REGEX="$REGEX -e 's/\(${CONF_LINE[$rIndex]}\)/${CONF_LINE[$(( $rIndex + 1 ))]}\1${Z}/${FLAGS}'" + rIndex=$(( $rIndex + 1 )) done } # env variable fed rules [[ -z "$HB_RULES" ]] || { CONF_ENV=( $( eval echo "$HB_RULES" ) ) - for (( r=0; r<${#CONF_ENV[@]}; r++ )); - do REGEX="$REGEX -e 's/\(${CONF_ENV[$r]}\)/${CONF_ENV[$(( $r + 1 ))]}\1${Z}/${FLAGS}'" - r=$(( $r + 1 )) + for (( rIndex=0; rIndex<${#CONF_ENV[@]}; rIndex++ )); + do REGEX="$REGEX -e 's/\(${CONF_ENV[$rIndex]}\)/${CONF_ENV[$(( $rIndex + 1 ))]}\1${Z}/${FLAGS}'" + rIndex=$(( $rIndex + 1 )) done } #~ echo ${CONF_ENV[@]}