diff --git a/bootstrap.sh b/bootstrap.sh index 91947e2..1a22bec 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -24,7 +24,7 @@ GIT_REPO_BASE="https://gitea.admin-a.hpetersenfamily.com/heath/ansible" GIT_REPO="${GIT_REPO_BASE}.git" -GIT_REPO_BRANCH="${1}" +GIT_REPO_BRANCH="${1:-"production"}" GIT_REPO_sudoers_d_hpf="${GIT_REPO_BASE}/raw/branch/main/files/etc_sudoers_d_hpf" GIT_REPO_ansible_pull_sh="${GIT_REPO_BASE}/raw/branch/main/files/home_hpf_ans_bin_ansible_pull_sh" @@ -151,4 +151,4 @@ mkdir -p "${ANSIBLE_PULL_SH_LOG_DIR}" chown hpf-ans:root "${ANSIBLE_PULL_SH_LOG_DIR}"; chmod ug=rwx,o= "${ANSIBLE_PULL_SH_LOG_DIR}" # Run ansible-pull to finish up -as_hpf_ans "bin/ansible-pull.sh ${GIT_REPO_BRANCH} bootstrap.yml" +as_hpf_ans "bin/ansible-pull.sh --branch ${GIT_REPO_BRANCH} bootstrap.yml" diff --git a/files/home_hpf_ans_bin_ansible_pull_sh b/files/home_hpf_ans_bin_ansible_pull_sh index 7f3fedd..4c3aa36 100644 --- a/files/home_hpf_ans_bin_ansible_pull_sh +++ b/files/home_hpf_ans_bin_ansible_pull_sh @@ -1,7 +1,23 @@ #!/bin/bash -# - Fix branch to check out +# - Process command line +GIT_REPO_BRANCH="production" +while [ $# -gt 0 ]; do + case "$1" in + -h|--help) + echo "Usage: $0 [--branch ]" + exit 0 + ;; + --branch) + shift 1 + if [ $# -eq 0 ] ; then echo "$0: ERROR - Branch not specified." ; exit 1 ; fi + GIT_REPO_BRANCH="$1" + shift 1 + ;; + esac +done +# - Include ansible virtual environment . "${HOME}/.ansible-venv/bin/activate" SCRIPT_NAME="$(basename "${0}")" @@ -23,5 +39,5 @@ if ! flock -n 9 ; then echo " - ERROR - Another copy of ${SCRIPT_NAME} is alread # - Do our work echo -ansible-pull --only-if-changed --url "${GIT_REPO}" --checkout "${@}" +ansible-pull --only-if-changed --url "${GIT_REPO}" --checkout "${GIT_REPO_BRANCH}" "${@}"