From 117821b738997b678092571fe693e66560c40297948b0b367e107de3c65aff31 Mon Sep 17 00:00:00 2001
From: Heath Petersen <Heath@HPetersenFamily.com>
Date: Wed, 15 Jul 2026 16:49:18 -0500
Subject: [PATCH] clean house

---
 bootstrap.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 1a22bec..a3a98ee 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 ####
 #### WARNING:
@@ -25,9 +25,8 @@
 GIT_REPO_BASE="https://gitea.admin-a.hpetersenfamily.com/heath/ansible"
 GIT_REPO="${GIT_REPO_BASE}.git"
 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"
-
+GIT_REPO_sudoers_d_hpf="${GIT_REPO_BASE}/raw/branch/${GIT_REPO_BRANCH}/files/etc_sudoers_d_hpf"
+GIT_REPO_ansible_pull_sh="${GIT_REPO_BASE}/raw/branch/${GIT_REPO_BRANCH}/files/home_hpf_ans_bin_ansible_pull_sh"
 
 ETC_sudoers_d_hpf="/etc/sudoers.d/hpf"
 
@@ -89,7 +88,7 @@ add_groups_to_user () {
 
 # $command_line
 as_hpf_ans () {
-    su --login hpf-ans -c "if [ -r \"${HPF_ANS_activate}\" ] ; then source \"${HPF_ANS_activate}\" ; fi ; ${1}"
+    su --login hpf-ans --command "if [ -r \"${HPF_ANS_activate}\" ] ; then source \"${HPF_ANS_activate}\" ; fi ; ${1}"
 }
 
 
@@ -151,4 +150,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 --branch ${GIT_REPO_BRANCH} bootstrap.yml"
+as_hpf_ans "$HPF_ANS_ansible_pull_sh --branch ${GIT_REPO_BRANCH} bootstrap.yml"