Skip to content

Commit

Permalink
Merge branch 'main' into schema-registry-uri
Browse files Browse the repository at this point in the history
  • Loading branch information
t-monaghan committed Oct 2, 2024
2 parents 9e8abe7 + be540cc commit 0a049e4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 36 deletions.
22 changes: 0 additions & 22 deletions bootstrap-test.Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,6 @@
"devbox run test-bash",
"devbox run test-zsh",
"devbox run test-fish"
],
"test-bash": [
"docker build -t bootstrap-script-test --build-arg NETSKOPE_CERT=\"$(cat \"$NETSKOPE_CERT_PATH\")\" --build-arg SHELL_VAR=bash -f ./bootstrap-test.Dockerfile .",
"docker run bootstrap-script-test bats test/bootstrap-agnostic.bats test/bootstrap-bash.bats"
],
"test-zsh": [
"docker build -t bootstrap-script-test --build-arg NETSKOPE_CERT=\"$(cat \"$NETSKOPE_CERT_PATH\")\" --build-arg SHELL_VAR=zsh -f ./bootstrap-test.Dockerfile .",
"docker run bootstrap-script-test bats test/bootstrap-agnostic.bats test/bootstrap-zsh.bats"
],
"test-fish": [
"docker build -t bootstrap-script-test --build-arg NETSKOPE_CERT=\"$(cat \"$NETSKOPE_CERT_PATH\")\" --build-arg SHELL_VAR=fish -f ./bootstrap-test.Dockerfile .",
"docker run bootstrap-script-test bats test/bootstrap-agnostic.bats test/bootstrap-fish.bats"
]
}
}
Expand Down
9 changes: 7 additions & 2 deletions scripts/install_hotel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,16 @@ install_hotel() {
INITIAL_DIR="$PWD"
TMPDIR=$(mktemp -d)
cd "$TMPDIR"
download_latest_hotel
download_latest_hotel
mkdir -p "$hotel_bin_path/"
mv hotel "$hotel_bin_path"
cd "$INITIAL_DIR"
rm -rf "$TMPDIR"
if [ -n "$github_token" ]; then
mkdir -p ~/.config/hotel
touch ~/.config/hotel/config.yaml
echo "github.token: $github_token" >> ~/.config/hotel/config.yaml
fi
log "=> installing hotel, this will ask for a sudo password"
sudo "$hotel_bin_path/hotel" setup launcher
}
Expand All @@ -95,7 +100,7 @@ main() {
github_token="$(security find-generic-password -s "com.cultureamp.hotel" -a github.app -w)"
fi

install_hotel
install_hotel
}

main "$@"

0 comments on commit 0a049e4

Please sign in to comment.