Skip to content

Commit fd74380

Browse files
authored
FIX: Handle wizard exit code 42 for swap creation (#1022)
The set -e at script start caused immediate exit when the wizard returned code 42 to signal swap creation, preventing the swap handling logic from running.
1 parent 167c0d0 commit fd74380

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

discourse-setup-ruby

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,15 @@ run_wizard() {
6666
rm -f "$DIR/.wizard_rebuild_needed"
6767
rm -f "$DIR/.wizard_swap_needed"
6868

69+
local wizard_exit=0
6970
docker run -it --rm \
7071
--name discourse-setup-wizard \
7172
--network host \
7273
-v "$DIR:/discourse_docker" \
7374
-v /var/run/docker.sock:/var/run/docker.sock \
7475
-e DISCOURSE_DOCKER_DIR=/discourse_docker \
7576
"$IMAGE_NAME" \
76-
"$@" < /dev/tty
77-
78-
local wizard_exit=$?
77+
"$@" < /dev/tty || wizard_exit=$?
7978

8079
# Check if wizard signaled that swap creation is needed (exit code 42)
8180
if [[ $wizard_exit -eq 42 ]] && [[ -f "$DIR/.wizard_swap_needed" ]]; then

0 commit comments

Comments
 (0)