diff options
| author | Mike Vink <mike.vink@stater.nl> | 2023-07-21 14:18:01 +0000 |
|---|---|---|
| committer | Mike Vink <mike.vink@stater.nl> | 2023-07-21 14:18:01 +0000 |
| commit | adfe9e470f07328c9ca5b9969d7617e38ef6f55a (patch) | |
| tree | dfb4b318d9958adf18c290c89dc2e22150c90664 /shell-scripts | |
| parent | 38a8ff81371ac24949503ba9dc9055c4534c65b7 (diff) | |
fixes
Diffstat (limited to 'shell-scripts')
| -rw-r--r-- | shell-scripts/checkout | 4 | ||||
| -rwxr-xr-x | shell-scripts/nixup | 2 | ||||
| -rwxr-xr-x | shell-scripts/terragrunt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/shell-scripts/checkout b/shell-scripts/checkout index 91f450a..95f28c8 100644 --- a/shell-scripts/checkout +++ b/shell-scripts/checkout @@ -4,13 +4,13 @@ error () { exit 1 } -eval "$(pass show work/shell-scripts/secrets)" +. <(pass show work/env) DEST_DIR="" case "${@}" in az|"az "*) shift LIST_PROJECTS="/_apis/projects?api-version=7.1-preview.4" - AUTH_HEADER="Authorization: Basic $WORK_AZDO_GIT_AUTH" + AUTH_HEADER="Authorization: Basic $(echo -n ":$GIT_PASS" | base64)" LIST_REPOSITORIES="/_apis/git/repositories?api-version=7.1-preview.1" GIT_DIR="$HOME/projects/" if [ ! -d $GIT_DIR ]; then diff --git a/shell-scripts/nixup b/shell-scripts/nixup index c0f43a0..afbe4b1 100755 --- a/shell-scripts/nixup +++ b/shell-scripts/nixup @@ -6,7 +6,7 @@ case "${@}" in sudo docker cp nix-data-${USER}:/nix ~ docker rm nix-data-${USER} } - docker create -v ${HOME}/nix:/nix --name nix-data-${USER} nixos/nix sh >/dev/null 2>&1 + docker create -v ${HOME}/nix:/nix --name nix-data-${USER} nixos/nix sh ;; nuke) docker rm nix-data-${USER} diff --git a/shell-scripts/terragrunt b/shell-scripts/terragrunt index 10d2160..38918e8 100755 --- a/shell-scripts/terragrunt +++ b/shell-scripts/terragrunt @@ -64,7 +64,7 @@ for var in $(pass show work/env) do case $var in TERRAGRUNT_EXTRA_MOUNTS*) - TERRAGRUNT_EXTRA_MOUNTS="${var#*=}" + TERRAGRUNT_EXTRA_MOUNTS="$TERRAGRUNT_EXTRA_MOUNTS ${var#*=}" ;; *) VARIABLES="$VARIABLES$(printf ' -e %s' "$var")" |