From 1515519107997d164e034f733f60b96b4cdd8b5d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Mon, 6 May 2024 10:11:07 -0500 Subject: [PATCH] feat: make it easier for others to re-run gitops scripts This should make it much easier for others to re-run the scripts by making the paths relative. --- docs/gitops-install.md | 3 +-- scripts/gitops-deploy.sh | 2 ++ scripts/gitops-secrets-gen.sh | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/gitops-install.md b/docs/gitops-install.md index c0968f9f4..ce4b0fd4d 100644 --- a/docs/gitops-install.md +++ b/docs/gitops-install.md @@ -48,8 +48,7 @@ To avoid defining many environment variables we'll simplify by creating an place it where we've cloned understack. A complete file would like like ```bash title="/path/to/uc-deploy/my-k3s.env" -UC_REPO="$HOME/devel/understack" -UC_DEPLOY="$HOME/devel/uc-deploy" +UC_DEPLOY="$(pwd)/$(dirname ${BASH_SOURCE[0]})" DEPLOY_NAME="my-k3s" UC_DEPLOY_GIT_URL=git@github.com:myorg/uc-deploy.git UC_DEPLOY_SSH_FILE="$HOME/devel/uc-deploy-key" diff --git a/scripts/gitops-deploy.sh b/scripts/gitops-deploy.sh index b63f0c705..5296e4208 100755 --- a/scripts/gitops-deploy.sh +++ b/scripts/gitops-deploy.sh @@ -24,6 +24,8 @@ fi . "$1" +export UC_REPO="$(git rev-parse --show-toplevel)" + if [ ! -d "${UC_REPO}" ]; then echo "UC_REPO not set to a path." >&2 usage diff --git a/scripts/gitops-secrets-gen.sh b/scripts/gitops-secrets-gen.sh index 81fcc3c50..d221e1980 100755 --- a/scripts/gitops-secrets-gen.sh +++ b/scripts/gitops-secrets-gen.sh @@ -18,7 +18,9 @@ if [ ! -f "$1" ]; then usage fi -source "$1" +. "$1" + +export UC_REPO="$(git rev-parse --show-toplevel)" if [ ! -d "${UC_DEPLOY}" ]; then echo "UC_DEPLOY not set to a path." >&2