shfmt (#199)

Co-authored-by: Carl Johnson <[email protected]>

Author: Peter Mounce

dev/setup_env_osx.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 set -eo pipefail
 
-command -v "python3" >/dev/null 2>&1 ||  { echo >&2 "I require python3 but it's not installed. Officially supported version is 3.7.5"; exit 1; }
+command -v "python3" >/dev/null 2>&1 || {
+  echo >&2 "I require python3 but it's not installed. Officially supported version is 3.7.5"
+  exit 1
+}
 
 readonly root="${BASH_SOURCE%/*}/.."
 
@@ -13,23 +16,23 @@ python3 -m virtualenv "${venv_dir}"
 
 platform=$(python3 -c "import platform; print(platform.system())")
 if [[ "${platform}" == "Windows" ]]; then
-    venv_bin="${venv_dir}/Scripts"
+  venv_bin="${venv_dir}/Scripts"
 else
-    venv_bin="${venv_dir}/bin"
+  venv_bin="${venv_dir}/bin"
 fi
 
 "${venv_bin}/python" -m pip install -r "${root}/python/requirements.txt"
 "${venv_bin}/python" -m pip install -r "${root}/ci/requirements.txt"
 
 # Install p4d binary if missing
 if ! [[ -x "$(command -v p4d)" ]]; then
-    wget http://www.perforce.com/downloads/perforce/r18.2/bin.macosx1010x86_64/p4d && sudo chmod +x p4d && sudo mv p4d /usr/local/bin/p4d
+  wget http://www.perforce.com/downloads/perforce/r18.2/bin.macosx1010x86_64/p4d && sudo chmod +x p4d && sudo mv p4d /usr/local/bin/p4d
 fi
 
 if ! p4d -V | grep '2018.2'; then
-    echo "WARNING: Version r18.2 (2018.2) of p4d is recommended for running tests. This version may not be compatible with existing server fixture."
+  echo "WARNING: Version r18.2 (2018.2) of p4d is recommended for running tests. This version may not be compatible with existing server fixture."
 fi
 
 if ! [[ -x "$(command -v bk)" ]]; then
-    echo "WARNING: `bk` cli is not installed. https://github.com/buildkite/cli"
+  echo "WARNING: 'bk' cli is not installed. https://github.com/buildkite/cli"
 fi

examples/buildkite-trigger.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 
-
 # P4 Trigger script that triggers buildkite builds
 # Usage:
 # my-pipeline change-commit //depot/... "%//depot/scripts/buildkite-trigger.sh% <organisation> <pipeline> %changelist% %user% %email%"

hooks/checkout

@@ -3,17 +3,16 @@ set -eo pipefail
 
 plugin_root="${BASH_SOURCE%/*}/.."
 
-
 # Try to use explicit python3 if its installed
 python_bin="python3"
 if ! [[ -x "$(command -v ${python_bin})" ]]; then
-    python_bin="python"
+  python_bin="python"
 fi
 
 # Ensure some version of virtualenv is installed
 # Lazy install avoids races between different jobs wanting different versions
 if [[ ! $(${python_bin} -m pip freeze) =~ "virtualenv==" ]]; then
-    ${python_bin} -m pip install "virtualenv==16.7.7"
+  ${python_bin} -m pip install "virtualenv==16.7.7"
 fi
 
 # Unique virtualenv for requirements.txt
@@ -22,20 +21,20 @@ venv_dir="${BUILDKITE_BUILD_CHECKOUT_PATH}/../.perforce-plugin-venv-${venv_md5}"
 
 platform=$(${python_bin} -c "import platform; print(platform.system())")
 if [[ "${platform}" == "Windows" ]]; then
-    venv_python_bin="/Scripts/python"
+  venv_python_bin="/Scripts/python"
 else
-    venv_python_bin="/bin/python"
+  venv_python_bin="/bin/python"
 fi
 
 if ! [[ -d "${venv_dir}" ]]; then
-    temp_venv_dir=$(mktemp -d -t perforce-plugin-venv-XXXXXX)
-    trap "rm -rf ${temp_venv_dir}" EXIT
-    ${python_bin} -m virtualenv "${temp_venv_dir}"
-    ${temp_venv_dir}${venv_python_bin} -m pip install -r "${plugin_root}/python/requirements.txt"
-    if ! [[ -d "${venv_dir}" ]]; then # second check to minimize venv init race
-        mv "${temp_venv_dir}" "${venv_dir}"
-    fi
-    echo "virtualenv created at ${venv_dir}"
+  temp_venv_dir=$(mktemp -d -t perforce-plugin-venv-XXXXXX)
+  trap "rm -rf ${temp_venv_dir}" EXIT
+  ${python_bin} -m virtualenv "${temp_venv_dir}"
+  ${temp_venv_dir}${venv_python_bin} -m pip install -r "${plugin_root}/python/requirements.txt"
+  if ! [[ -d "${venv_dir}" ]]; then # second check to minimize venv init race
+    mv "${temp_venv_dir}" "${venv_dir}"
+  fi
+  echo "virtualenv created at ${venv_dir}"
 fi
 
 ${venv_dir}${venv_python_bin} "${plugin_root}/python/checkout.py"

hooks/pre-checkout

@@ -2,28 +2,28 @@
 set -eo pipefail
 
 # Allow sharing of perforce client workspaces for the same stream between pipelines
-if [[ "${BUILDKITE_PLUGIN_PERFORCE_SHARE_WORKSPACE}" == true ]] ; then
-    echo "Workspace sharing enabled"
+if [[ "${BUILDKITE_PLUGIN_PERFORCE_SHARE_WORKSPACE}" == true ]]; then
+  echo "Workspace sharing enabled"
 
-    STREAM="${BUILDKITE_PLUGIN_PERFORCE_STREAM}"
-    if [[ -z "${STREAM}" ]] ; then
-      echo "Error: You must use stream workspaces to enable shared workspaces" >&2
-      exit 1
-    fi
-    if [[ "${BUILDKITE_AGENT_META_DATA_AGENT_COUNT}" -gt 1 ]] ; then
-      echo "Error: You cannot share stream workspaces when running more than one agent" >&2
-      exit 1
-    fi
-    if [[ "${BUILDKITE_PLUGIN_PERFORCE_STREAM_SWITCHING}" == true ]] ; then
-      echo "Stream switching enabled"
-      # Sanitize '//depot/stream-name' to 'depot'
-      SANITIZED_STREAM=$(echo $STREAM | python -c "import sys; print(sys.stdin.read().split('/')[2]);")
-    else # Create a directory per-stream
-      # Sanitize '//depot/stream-name' to '__depot_stream-name'
-      SANITIZED_STREAM=$(echo $STREAM | python -c "import sys; print(sys.stdin.read().replace('/', '_'));")
-    fi
-    # Instead of builds/<agent_number>/<pipeline>, checkout to builds/<stream_name>
-    PERFORCE_CHECKOUT_PATH="${BUILDKITE_BUILD_CHECKOUT_PATH}/../../${SANITIZED_STREAM}"
-    export BUILDKITE_BUILD_CHECKOUT_PATH="${PERFORCE_CHECKOUT_PATH}"
-    echo "Changed BUILDKITE_BUILD_CHECKOUT_PATH to ${PERFORCE_CHECKOUT_PATH}"
+  STREAM="${BUILDKITE_PLUGIN_PERFORCE_STREAM}"
+  if [[ -z "${STREAM}" ]]; then
+    echo "Error: You must use stream workspaces to enable shared workspaces" >&2
+    exit 1
+  fi
+  if [[ "${BUILDKITE_AGENT_META_DATA_AGENT_COUNT}" -gt 1 ]]; then
+    echo "Error: You cannot share stream workspaces when running more than one agent" >&2
+    exit 1
+  fi
+  if [[ "${BUILDKITE_PLUGIN_PERFORCE_STREAM_SWITCHING}" == true ]]; then
+    echo "Stream switching enabled"
+    # Sanitize '//depot/stream-name' to 'depot'
+    SANITIZED_STREAM=$(echo $STREAM | python -c "import sys; print(sys.stdin.read().split('/')[2]);")
+  else # Create a directory per-stream
+    # Sanitize '//depot/stream-name' to '__depot_stream-name'
+    SANITIZED_STREAM=$(echo $STREAM | python -c "import sys; print(sys.stdin.read().replace('/', '_'));")
+  fi
+  # Instead of builds/<agent_number>/<pipeline>, checkout to builds/<stream_name>
+  PERFORCE_CHECKOUT_PATH="${BUILDKITE_BUILD_CHECKOUT_PATH}/../../${SANITIZED_STREAM}"
+  export BUILDKITE_BUILD_CHECKOUT_PATH="${PERFORCE_CHECKOUT_PATH}"
+  echo "Changed BUILDKITE_BUILD_CHECKOUT_PATH to ${PERFORCE_CHECKOUT_PATH}"
 fi