reformat bourne shell scripts

using shfmt -l -w <scriptname>

Author: d-w-moore

irods/test/login_auth_test.sh

@@ -9,74 +9,82 @@ LOCAL_ACCOUNT_ENV_FILE=~/.irods/irods_environment.json
 cannot_iinit=''
 tries=8
 while true; do
-  iinit_as_rods >/dev/null 2>&1 && break
-  [ $((--tries)) -le 0 ] && { cannot_iinit=1; break; }
-  sleep 5
+    iinit_as_rods >/dev/null 2>&1 && break
+    [ $((--tries)) -le 0 ] && {
+        cannot_iinit=1
+        break
+    }
+    sleep 5
 done
-[ -n "$cannot_iinit" ] && { echo >&2 "Could not iinit as rods."; exit 2; }
+[ -n "$cannot_iinit" ] && {
+    echo >&2 "Could not iinit as rods."
+    exit 2
+}
 
 setup_preconnect_preference DONT_CARE
 
 add_irods_to_system_pam_configuration
 
-
 # set up /etc/irods/ssl directory and files
 set_up_ssl sudo
 
 sudo useradd -ms/bin/bash alissa
 sudo chpasswd <<<"alissa:test123"
 
 update_json_file $IRODS_SERVICE_ACCOUNT_ENV_FILE \
-                 "$(newcontent $IRODS_SERVICE_ACCOUNT_ENV_FILE ssl_keys)"
+    "$(newcontent $IRODS_SERVICE_ACCOUNT_ENV_FILE ssl_keys)"
 
 # This is mostly so we can call python3 as just "python"
-activate_virtual_env_with_prc_installed >/dev/null 2>&1 || { echo >&2 "couldn't set up virtual environment"; exit 1; }
+activate_virtual_env_with_prc_installed >/dev/null 2>&1 || {
+    echo >&2 "couldn't set up virtual environment"
+    exit 1
+}
 
 server_hup=
 if irods_server_version ge 5.0.0; then
-  server_hup="y"
-  update_json_file $IRODS_SERVER_CONFIG \
-                   "$(newcontent $IRODS_SERVER_CONFIG tls_server_items tls_client_items)"
+    server_hup="y"
+    update_json_file $IRODS_SERVER_CONFIG \
+        "$(newcontent $IRODS_SERVER_CONFIG tls_server_items tls_client_items)"
 
-  sudo su - irods -c "$IRODS_CONTROL_PATH/manage_irods5_procs rescan-config"
+    sudo su - irods -c "$IRODS_CONTROL_PATH/manage_irods5_procs rescan-config"
 fi
 
 # Configure clients with admin user + TLS
 
 update_json_file $LOCAL_ACCOUNT_ENV_FILE \
-                 "$(newcontent $LOCAL_ACCOUNT_ENV_FILE ssl_keys encrypt_keys)"
+    "$(newcontent $LOCAL_ACCOUNT_ENV_FILE ssl_keys encrypt_keys)"
 
 update_time=0
 # We won't time out, however we will warn for each minute the server
 # has not returned to readiness.
 if [ "$server_hup" = "y" ]; then
-  # wait for server to be ready after configuration reload
-  while true; do
-    sleep 2
-    if ils >/dev/null 2>&1; then
-      break
-    else
-      now=$(date +%s)
-      if [ $now -ge $((update_time + 60)) ]; then
-        echo >&2 "At [$(date)] ... still waiting on server reload";
-        update_time=$now
-      fi
-    fi
-  done
+    # wait for server to be ready after configuration reload
+    while true; do
+        sleep 2
+        if ils >/dev/null 2>&1; then
+            break
+        else
+            now=$(date +%s)
+            if [ $now -ge $((update_time + 60)) ]; then
+                echo >&2 "At [$(date)] ... still waiting on server reload"
+                update_time=$now
+            fi
+        fi
+    done
 fi
 
 if [ -n "$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" ]; then
-  original_script="/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT"
-
-  # Run tests.
-  if [ -x "$original_script" ]; then
-    command "$original_script" $*
-  elif [[ $original_script =~ \.py$ ]]; then
-    python "$original_script" $*
-  elif [[ $original_script =~ \.bats$ ]]; then
-    bats "$original_script"
-  else
-    echo >&2 "I don't know how to run this: original_script=[$original_script]"
-  fi
+    original_script="/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT"
+
+    # Run tests.
+    if [ -x "$original_script" ]; then
+        command "$original_script" $*
+    elif [[ $original_script =~ \.py$ ]]; then
+        python "$original_script" $*
+    elif [[ $original_script =~ \.bats$ ]]; then
+        bats "$original_script"
+    else
+        echo >&2 "I don't know how to run this: original_script=[$original_script]"
+    fi
 
 fi

irods/test/scripts/run_suite_locally.sh

@@ -5,8 +5,8 @@ SCRIPT_DIR=$(dirname "$0")
 . "$SCRIPT_DIR"/test_support_functions
 
 report_environment_variables() {
-  echo "PRC under test with these environment variables active:"
-  python -c "
+    echo "PRC under test with these environment variables active:"
+    python -c "
 import os, sys
 for name in ['IRODS_PACKAGE_VERSION','PYTHON_VERSION']:
   value = os.environ.get(name)
@@ -17,8 +17,8 @@ print(f'{sys.version = }')
 }
 
 run_tests() {
-  setup_pyN
-  su - testuser -c "
+    setup_pyN
+    su - testuser -c "
   set -e
   source /pyN/bin/activate
   pip install -e /prc.rw[tests]
@@ -34,17 +34,17 @@ run_tests() {
   python runner.py --output_tests_skipped /tmp/skipped.txt -e PYTHON_RULE_ENGINE_INSTALLED
   "
 
-  # Install PREP (Python Rule Engine Plugin).
-  (
-      set -e
-      cd "/prc/test_harness/single_node"
-      apt update
-      ./install_python_rule_engine
-      su irods -c './setup_python_rule_engine --wait'
-  )
+    # Install PREP (Python Rule Engine Plugin).
+    (
+        set -e
+        cd "/prc/test_harness/single_node"
+        apt update
+        ./install_python_rule_engine
+        su irods -c './setup_python_rule_engine --wait'
+    )
 
-  # Run PREP-dependent tests that were previously skipped.
-  su - testuser -c "
+    # Run PREP-dependent tests that were previously skipped.
+    su - testuser -c "
   set -e
   source /pyN/bin/activate
   cd /prc.rw/irods/test

irods/test/scripts/update_json_for_test

@@ -49,21 +49,21 @@ update_json_file() {
 
 restore_json_files() {
     local kk
-    for kk in ${!RESTORE_FILES[@]};do
+    for kk in ${!RESTORE_FILES[@]}; do
         sudo mv -f "${RESTORE_FILES["$kk"]}" "$kk"
     done
 }
 
-newcontent () {
-  local file=$1
-  shift
-  local j=$(sudo cat "$file")
-  while [ $# -gt 0 ]; do
-    eval '
+newcontent() {
+    local file=$1
+    shift
+    local j=$(sudo cat "$file")
+    while [ $# -gt 0 ]; do
+        eval '
     for kk in ${!'$1'[@]}; do
         j=$(jq ".$kk=${'$1'[$kk]}" <<<"$j")
     done'
-    shift
-  done
-  echo "$j"
+        shift
+    done
+    echo "$j"
 }

test_harness/multiple_node/irods_catalog_provider_4/entrypoint.sh

@@ -4,8 +4,7 @@ catalog_db_hostname=irods-catalog
 
 echo "Waiting for iRODS catalog database to be ready"
 
-until pg_isready -h ${catalog_db_hostname} -d ICAT -U irods -q
-do
+until pg_isready -h ${catalog_db_hostname} -d ICAT -U irods -q; do
     sleep 1
 done
 
@@ -15,7 +14,7 @@ setup_input_file=/irods_setup.input
 
 if [ -e "${setup_input_file}" ]; then
     echo "Running iRODS setup"
-    python3 /var/lib/irods/scripts/setup_irods.py < "${setup_input_file}"
+    python3 /var/lib/irods/scripts/setup_irods.py <"${setup_input_file}"
     rm /irods_setup.input
 fi
 
@@ -26,23 +25,25 @@ chown -R irods:irods /irods_shared
 
 {
     [ -f ~/provider-address.do_not_remove ] || {
-    jq <$ORIG_SERVER_CONFIG >$MOD_SERVER_CONFIG \
-    '.host_resolution.host_entries += [
+        jq <$ORIG_SERVER_CONFIG >$MOD_SERVER_CONFIG \
+            '.host_resolution.host_entries += [
         {
             "address_type": "local",
             "addresses": [
                 "irods-catalog-provider",
                 "'$(hostname)'"
             ]
         }
-    ]' && \
-    cat <$MOD_SERVER_CONFIG >$ORIG_SERVER_CONFIG && \
-    touch ~/provider-address.do_not_remove
+    ]' &&
+            cat <$MOD_SERVER_CONFIG >$ORIG_SERVER_CONFIG &&
+            touch ~/provider-address.do_not_remove
     }
-} || { echo >&2 "Error modifying $ORIG_SERVER_CONFIG"; exit 1; }
+} || {
+    echo >&2 "Error modifying $ORIG_SERVER_CONFIG"
+    exit 1
+}
 
 echo "Starting server"
 
 cd /usr/sbin
 su irods -c './irodsServer -u'
-

test_harness/multiple_node/irods_catalog_provider_5/entrypoint.sh

@@ -4,8 +4,7 @@ catalog_db_hostname=irods-catalog
 
 echo "Waiting for iRODS catalog database to be ready"
 
-until pg_isready -h ${catalog_db_hostname} -d ICAT -U irods -q
-do
+until pg_isready -h ${catalog_db_hostname} -d ICAT -U irods -q; do
     sleep 1
 done
 
@@ -15,7 +14,7 @@ setup_input_file=/irods_setup.input
 
 if [ -e "${setup_input_file}" ]; then
     echo "Running iRODS setup"
-    python3 /var/lib/irods/scripts/setup_irods.py < "${setup_input_file}"
+    python3 /var/lib/irods/scripts/setup_irods.py <"${setup_input_file}"
     rm /irods_setup.input
 fi
 
@@ -27,23 +26,25 @@ chmod 0777 /irods_shared
 
 {
     [ -f ~/provider-address.do_not_remove ] || {
-    jq <$ORIG_SERVER_CONFIG >$MOD_SERVER_CONFIG \
-    '.host_resolution.host_entries += [
+        jq <$ORIG_SERVER_CONFIG >$MOD_SERVER_CONFIG \
+            '.host_resolution.host_entries += [
         {
             "address_type": "local",
             "addresses": [
                 "irods-catalog-provider",
                 "'$(hostname)'"
             ]
         }
-    ]' && \
-    cat <$MOD_SERVER_CONFIG >$ORIG_SERVER_CONFIG && \
-    touch ~/provider-address.do_not_remove
+    ]' &&
+            cat <$MOD_SERVER_CONFIG >$ORIG_SERVER_CONFIG &&
+            touch ~/provider-address.do_not_remove
     }
-} || { echo >&2 "Error modifying $ORIG_SERVER_CONFIG"; exit 1; }
+} || {
+    echo >&2 "Error modifying $ORIG_SERVER_CONFIG"
+    exit 1
+}
 
 echo "Starting server"
 
 cd /usr/sbin
 su irods -c './irodsServer -p /tmp/irods.pid --stdout'
-

test_harness/multiple_node/start_containers.sh

@@ -4,21 +4,22 @@ set -e
 # This script is launched on the docker host.
 
 usage() {
-  echo >&2 "usage: $0 [-n] [-b '<docker compose build args>'] irods_version python_version"; exit 2;
+    echo >&2 "usage: $0 [-n] [-b '<docker compose build args>'] irods_version python_version"
+    exit 2
 }
 
 SHELL_DOCKER_COMPOSE_BUILD_ARGS=""
 DO_NOT_RUN=""
 
 while [[ $1 = -* ]]; do
-  if [ "$1" = "-b" ]; then
-      SHELL_DOCKER_COMPOSE_BUILD_ARGS=$2
-      shift 2
-  fi
-  if [ "$1" = "-n" ]; then
-      DO_NOT_RUN=1
-      shift
-  fi
+    if [ "$1" = "-b" ]; then
+        SHELL_DOCKER_COMPOSE_BUILD_ARGS=$2
+        shift 2
+    fi
+    if [ "$1" = "-n" ]; then
+        DO_NOT_RUN=1
+        shift
+    fi
 done
 
 if [ $# -eq 2 ]; then
@@ -29,9 +30,8 @@ else
     usage
 fi
 
-
 [ -n "$PYTHON_VERSION" -a -n "$IRODS_VERSION" ] || {
-     usage
+    usage
 }
 
 IRODS_MAJOR=${IRODS_VERSION//.*/}

test_harness/multiple_node/stop_containers.sh

@@ -4,7 +4,8 @@ set -e
 # This script is launched on the docker host.
 
 usage() {
-  echo >&2 "usage: $0 irods_version"; exit 1;
+    echo >&2 "usage: $0 irods_version"
+    exit 1
 }
 
 if [ $# -eq 1 ]; then
@@ -14,9 +15,8 @@ else
     usage
 fi
 
-
 [ -n "$IRODS_VERSION" ] || {
-     usage
+    usage
 }
 
 IRODS_MAJOR=${IRODS_VERSION//.*/}

test_harness/single_node/create_docker_images.sh

@@ -4,7 +4,8 @@ export IRODS_PACKAGE_VERSION=$1
 export PYTHON_VERSION=$2
 
 [ -z "$1" -o -z "$2" ] && {
-  echo >&2 "usage: $0 <irods-version> <python-version>"; exit 2;
+    echo >&2 "usage: $0 <irods-version> <python-version>"
+    exit 2
 }
 shift 2