Skip to content

Commit 031a1f1

Browse files
authored
Add missing lib script to sentry-admin.sh (#3693)
Sentry Admin Script always fail because of missing import of lib script. ### Legal Boilerplate Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.
1 parent 9e085a0 commit 031a1f1

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

install.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
#!/usr/bin/env bash
2-
set -eE
2+
set -eEuo pipefail
3+
test "${DEBUG:-}" && set -x
4+
5+
# Override any user-supplied umask that could cause problems, see #1222
6+
umask 002
37

48
# Pre-pre-flight? 🤷
5-
if [[ -n "$MSYSTEM" ]]; then
9+
if [[ -n "${MSYSTEM:-}" ]]; then
610
echo "Seems like you are using an MSYS2-based system (such as Git Bash) which is not supported. Please use WSL instead."
711
exit 1
812
fi
913

14+
source install/_logging.sh
1015
source install/_lib.sh
1116

1217
# Pre-flight. No impact yet.

install/_lib.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
set -euo pipefail
2-
test "${DEBUG:-}" && set -x
3-
4-
# Override any user-supplied umask that could cause problems, see #1222
5-
umask 002
6-
7-
# Thanks to https://unix.stackexchange.com/a/145654/108960
8-
log_file=sentry_install_log-$(date +'%Y-%m-%d_%H-%M-%S').txt
9-
exec &> >(tee -a "$log_file")
10-
111
# Allow `.env` overrides using the `.env.custom` file.
122
# We pass this to docker compose in a couple places.
133
if [[ -f .env.custom ]]; then

install/_logging.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Thanks to https://unix.stackexchange.com/a/145654/108960
2+
log_file=sentry_install_log-$(date +'%Y-%m-%d_%H-%M-%S').txt
3+
exec &> >(tee -a "$log_file")

install/dc-detect-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ proxy_args="--build-arg http_proxy=${http_proxy:-} --build-arg https_proxy=${htt
3434
dcr="$dc run --pull=never --rm"
3535
dcb="$dc build $proxy_args"
3636
dbuild="docker build $proxy_args"
37-
37+
echo "$dcr"
3838
echo "${_endgroup}"

sentry-admin.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
cd $(dirname $0)
55

66
# Detect docker and platform state.
7+
source install/_lib.sh
78
source install/dc-detect-version.sh
89
source install/detect-platform.sh
910

0 commit comments

Comments
 (0)