From 9fae1f4211aeabeaa8ed4b4ccad2469353d54bac Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Sun, 1 Oct 2023 20:44:02 +0200 Subject: [PATCH] fix: use whitespaces instead of tabs --- rootfs/usr/local/bin/clone | 74 ++++++++++++------------- rootfs/usr/local/bin/clone-commit | 36 ++++++------ rootfs/usr/local/bin/clone-pull-request | 8 +-- rootfs/usr/local/bin/clone-tag | 8 +-- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/rootfs/usr/local/bin/clone b/rootfs/usr/local/bin/clone index d6713dc..4a8106a 100755 --- a/rootfs/usr/local/bin/clone +++ b/rootfs/usr/local/bin/clone @@ -1,17 +1,17 @@ #!/bin/bash if [[ -n "${DRONE_WORKSPACE}" ]]; then - # ensure the unprivileged drone user can write - # to the workspace. This is required because - # the workspace is a docker volume and is owned - # by root. - # sudo mkdir -p ${DRONE_WORKSPACE} - # sudo chown drone:drone ${DRONE_WORKSPACE} + # ensure the unprivileged drone user can write + # to the workspace. This is required because + # the workspace is a docker volume and is owned + # by root. + # sudo mkdir -p ${DRONE_WORKSPACE} + # sudo chown drone:drone ${DRONE_WORKSPACE} - # ensure the workspace is the current working - # directory. This should already be the case, - # but we cd just to be safe. - cd "${DRONE_WORKSPACE}" || exit 1 + # ensure the workspace is the current working + # directory. This should already be the case, + # but we cd just to be safe. + cd "${DRONE_WORKSPACE}" || exit 1 fi # force the home directory path. @@ -25,7 +25,7 @@ fi # the netrc file. if [[ -n "${DRONE_NETRC_MACHINE}" ]]; then - cat < "${HOME}/.netrc" + cat < "${HOME}/.netrc" machine ${DRONE_NETRC_MACHINE} login ${DRONE_NETRC_USERNAME} password ${DRONE_NETRC_PASSWORD} @@ -36,13 +36,13 @@ fi # the ssh key and add the netrc machine to the # known hosts file. if [[ -n "${DRONE_SSH_KEY}" ]]; then - mkdir "${HOME}/.ssh" - echo -n "${DRONE_SSH_KEY}" > "${HOME}/.ssh/id_rsa" - chmod 600 "${HOME}/.ssh/id_rsa" + mkdir "${HOME}/.ssh" + echo -n "${DRONE_SSH_KEY}" > "${HOME}/.ssh/id_rsa" + chmod 600 "${HOME}/.ssh/id_rsa" - touch "${HOME}/.ssh/known_hosts" - chmod 600 "${HOME}/.ssh/known_hosts" - ssh-keyscan -H "${DRONE_NETRC_MACHINE}" > /etc/ssh/ssh_known_hosts 2> /dev/null + touch "${HOME}/.ssh/known_hosts" + chmod 600 "${HOME}/.ssh/known_hosts" + ssh-keyscan -H "${DRONE_NETRC_MACHINE}" > /etc/ssh/ssh_known_hosts 2> /dev/null fi # # AWS codecommit support using AWS access key & secret key @@ -62,11 +62,11 @@ fi if [[ -z "${DRONE_COMMIT_AUTHOR_NAME}" ]]; then - export DRONE_COMMIT_AUTHOR_NAME=drone + export DRONE_COMMIT_AUTHOR_NAME=drone fi if [[ -z "${DRONE_COMMIT_AUTHOR_EMAIL}" ]]; then - export DRONE_COMMIT_AUTHOR_EMAIL=drone@localhost + export DRONE_COMMIT_AUTHOR_EMAIL=drone@localhost fi export GIT_AUTHOR_NAME=${DRONE_COMMIT_AUTHOR_NAME} @@ -95,30 +95,30 @@ case ${DRONE_COMMIT_REF} in esac git_clone_retry(){ - retries="${PLUGIN_RETRIES:-0}" - if [ -n "${retries##*[0-9]*}" ] || [ "${retries}" -lt 0 ]; then - echo "PLUGIN_RETRIES defined but is not a number: ${retries}" >&2 - exit 1 - fi + retries="${PLUGIN_RETRIES:-0}" + if [ -n "${retries##*[0-9]*}" ] || [ "${retries}" -lt 0 ]; then + echo "PLUGIN_RETRIES defined but is not a number: ${retries}" >&2 + exit 1 + fi - echo "Cloning with ${retries} retries" - n=0 - until [ "$n" -gt "${retries}" ]; do - $1 && return - n=$((n+1)) - done + echo "Cloning with ${retries} retries" + n=0 + until [ "$n" -gt "${retries}" ]; do + $1 && return + n=$((n+1)) + done - exit 1 + exit 1 } case ${CLONE_TYPE} in pull_request) - git_clone_retry clone-pull-request - ;; + git_clone_retry clone-pull-request + ;; tag) - git_clone_retry clone-tag - ;; + git_clone_retry clone-tag + ;; *) - git_clone_retry clone-commit - ;; + git_clone_retry clone-commit + ;; esac \ No newline at end of file diff --git a/rootfs/usr/local/bin/clone-commit b/rootfs/usr/local/bin/clone-commit index 64632b4..7a0f924 100755 --- a/rootfs/usr/local/bin/clone-commit +++ b/rootfs/usr/local/bin/clone-commit @@ -1,15 +1,18 @@ #!/bin/bash +set -e set -x -FLAGS="" +GIT_FETCH_ARGS="" +GIT_CHECKOUT_ARGS="" + if [[ -n "${PLUGIN_DEPTH}" ]]; then - FLAGS="--depth=${PLUGIN_DEPTH}" + GIT_FETCH_ARGS="${GIT_FETCH_ARGS} --depth=${PLUGIN_DEPTH}" fi if [ ! -d .git ]; then - git init - git remote add origin "${DRONE_REMOTE_URL}" + git init + git remote add origin "${DRONE_REMOTE_URL}" fi # the branch may be empty for certain event types, @@ -18,28 +21,25 @@ fi # we intentially omit depth flags to avoid failed # clones due to lack of history. if [[ -z "${DRONE_COMMIT_BRANCH}" ]] && [[ -n "${DRONE_COMMIT_SHA}" ]]; then - set -e - set -x - git fetch origin - git checkout --quiet --force "${DRONE_COMMIT_SHA}" - exit 0 + GIT_CHECKOUT_ARGS="${GIT_CHECKOUT_ARGS} --quiet --force ${DRONE_COMMIT_SHA}" + GIT_FETCH_ARGS="${GIT_FETCH_ARGS} origin" fi # the commit sha may be empty for builds that are # manually triggered in Harness CI Enterprise. If # the commit is empty we clone the branch. if [[ -n "${DRONE_COMMIT_BRANCH}" ]] && [[ -z "${DRONE_COMMIT_SHA}" ]]; then - set -e - set -x - git fetch "${FLAGS}" origin "+refs/heads/${DRONE_COMMIT_BRANCH}:refs/remotes/origin/${DRONE_COMMIT_BRANCH}" - git checkout -b "${DRONE_COMMIT_BRANCH}" "refs/remotes/origin/${DRONE_COMMIT_BRANCH}" - exit 0 + GIT_CHECKOUT_ARGS="${GIT_CHECKOUT_ARGS} -b ${DRONE_COMMIT_BRANCH} refs/remotes/origin/${DRONE_COMMIT_BRANCH}" + GIT_FETCH_ARGS="${GIT_FETCH_ARGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:refs/remotes/origin/${DRONE_COMMIT_BRANCH}" fi # if the commit sha and branch name not empty, fetch the branch even if a # fast-forward is not possible. Checkout the specified commit sha which must be # part of the branch. -set -e -set -x -git fetch "${FLAGS}" origin "+refs/heads/${DRONE_COMMIT_BRANCH}:refs/remotes/origin/${DRONE_COMMIT_BRANCH}" -git checkout "${DRONE_COMMIT_SHA}" -b "refs/remotes/origin/${DRONE_COMMIT_BRANCH}" +if [[ -n "${DRONE_COMMIT_BRANCH}" ]] && [[ -n "${DRONE_COMMIT_SHA}" ]]; then + GIT_CHECKOUT_ARGS="${GIT_CHECKOUT_ARGS} -b ${DRONE_COMMIT_SHA} -b refs/remotes/origin/${DRONE_COMMIT_BRANCH}" + GIT_FETCH_ARGS="${GIT_FETCH_ARGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:refs/remotes/origin/${DRONE_COMMIT_BRANCH}" +fi + +git fetch ${GIT_FETCH_ARGS} +git checkout ${GIT_CHECKOUT_ARGS} diff --git a/rootfs/usr/local/bin/clone-pull-request b/rootfs/usr/local/bin/clone-pull-request index f8f8557..9c26204 100755 --- a/rootfs/usr/local/bin/clone-pull-request +++ b/rootfs/usr/local/bin/clone-pull-request @@ -2,18 +2,18 @@ FLAGS="" if [[ -n "${PLUGIN_DEPTH}" ]]; then - FLAGS="--depth=${PLUGIN_DEPTH}" + FLAGS="--depth=${PLUGIN_DEPTH}" fi if [ ! -d .git ]; then - git init - git remote add origin "${DRONE_REMOTE_URL}" + git init + git remote add origin "${DRONE_REMOTE_URL}" fi set -e set -x -git fetch "${FLAGS}" origin "+refs/heads/${DRONE_COMMIT_BRANCH}:" +git fetch ${FLAGS} origin "+refs/heads/${DRONE_COMMIT_BRANCH}:" git checkout "${DRONE_COMMIT_BRANCH}" git fetch origin "${DRONE_COMMIT_REF}:" diff --git a/rootfs/usr/local/bin/clone-tag b/rootfs/usr/local/bin/clone-tag index 45e3f82..aaaccaf 100755 --- a/rootfs/usr/local/bin/clone-tag +++ b/rootfs/usr/local/bin/clone-tag @@ -2,16 +2,16 @@ FLAGS="" if [[ -n "${PLUGIN_DEPTH}" ]]; then - FLAGS="--depth=${PLUGIN_DEPTH}" + FLAGS="--depth=${PLUGIN_DEPTH}" fi if [ ! -d .git ]; then - git init - git remote add origin "${DRONE_REMOTE_URL}" + git init + git remote add origin "${DRONE_REMOTE_URL}" fi set -e set -x -git fetch "${FLAGS}" origin "+refs/tags/${DRONE_TAG}:" +git fetch ${FLAGS} origin "+refs/tags/${DRONE_TAG}:" git checkout --quiet --force FETCH_HEAD