From e041a4c24bd887976f278dfd72e5475c48f2d336 2019-08-14 19:29:30 From: Branko Majic Date: 2019-08-14 19:29:30 Subject: [PATCH] MAR-145: Replace all tabs with whitespaces (code style fix). --- diff --git a/roles/common/files/pip_check_requirements_upgrades.sh b/roles/common/files/pip_check_requirements_upgrades.sh index 18ee71075fb93e0dede7a905dd88819107ba29b7..457d1c9a1560fc2601e44fa1d6f73c73ffd95c24 100755 --- a/roles/common/files/pip_check_requirements_upgrades.sh +++ b/roles/common/files/pip_check_requirements_upgrades.sh @@ -167,9 +167,9 @@ fi # Parse the arguments while getopts "V:qdvh" opt; do case "$opt" in - V) virtualenv="$OPTARG";; - q) quiet=1;; - d) debug=1;; + V) virtualenv="$OPTARG";; + q) quiet=1;; + d) debug=1;; v) version exit "$SUCCESS";; h) usage @@ -214,24 +214,24 @@ fi for environment in "$config_dir"/*; do # Empty directory. if [[ ! -e $environment ]]; then - error "Configuration directory is empty: $config_dir" - exit "$ERROR_CONFIG_DIR" + error "Configuration directory is empty: $config_dir" + exit "$ERROR_CONFIG_DIR" fi # Process each .in file. for req_in in "$environment"/*.in; do - # Directory without .in files. - if [[ ! -e $req_in ]]; then - error "No .in files in directory, skipping: $environment" - continue - fi - - # Figure out if .txt file exists. - req_txt="${req_in%.in}.txt" - if [[ ! -f $req_txt ]]; then - [[ $quiet == 0 ]] && info "Skipping input file with missing .txt file: $req_in" - continue - fi + # Directory without .in files. + if [[ ! -e $req_in ]]; then + error "No .in files in directory, skipping: $environment" + continue + fi + + # Figure out if .txt file exists. + req_txt="${req_in%.in}.txt" + if [[ ! -f $req_txt ]]; then + [[ $quiet == 0 ]] && info "Skipping input file with missing .txt file: $req_in" + continue + fi # Clean up the existing requirements file to contain only # package versioning information. @@ -242,7 +242,7 @@ for environment in "$config_dir"/*; do result="$?" if [[ $result != 0 ]]; then error "Failed while running pip-compile command against (see error stack trace above): $req_in" - continue + continue fi # Clean up the new requirements to contain only package @@ -252,23 +252,23 @@ for environment in "$config_dir"/*; do debug "Current requirements:\n$(echo "$current")" debug "New requirements:\n$(echo "$new")" - # Run diff, storing the output and result. + # Run diff, storing the output and result. # This is using Bash process substitution, which helps avoid # creating and keeping track of temporary files (since diff # must be fed with two input files). E.g. the <() will # essentially be path to a Bash-created/managed temporary # file. - diff=$(diff -u <(echo "$current") <(echo "$new")) - result="$?" - - # Show warning about available updates. - if [[ $result == 0 ]]; then - [[ $quiet == 0 ]] && info "No upgrades available for: $req_txt" - else - warning "Upgrades available for: $req_txt" - echo - echo "$diff" - echo - fi + diff=$(diff -u <(echo "$current") <(echo "$new")) + result="$?" + + # Show warning about available updates. + if [[ $result == 0 ]]; then + [[ $quiet == 0 ]] && info "No upgrades available for: $req_txt" + else + warning "Upgrades available for: $req_txt" + echo + echo "$diff" + echo + fi done done