From 8de497cbeb6c4bb7728d5f3a47524c5bd5169cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Almir=20Saraj=C4=8Di=C4=87?= Date: Wed, 18 Sep 2024 23:22:35 +0200 Subject: [PATCH] Try again --- priv/static/Linux.sh | 8 ++++---- priv/static/macOS.sh | 8 ++++---- test/scripts/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh index d61418d3..bff4c683 100755 --- a/priv/static/Linux.sh +++ b/priv/static/Linux.sh @@ -89,15 +89,15 @@ install() { exit 1 fi mkdir -p "$HOME/.local/bin" - curl -L "https://github.com/jdxcode/mise/releases/latest/download/mise-linux-$mise_arch" -o "$HOME/.local/bin/mise" + curl -fsSL "https://github.com/jdxcode/mise/releases/latest/download/mise-linux-$mise_arch" -o "$HOME/.local/bin/mise" chmod +x "$HOME/.local/bin/mise" printf 'eval "$(%s activate %s)"\n' "$HOME/.local/bin/mise" "$current_shell" >>"$config_file" - eval "$("$HOME/.local/bin/mise" activate "$current_shell")" # Verify that 'mise' is installed correctly - "$HOME/.local/bin/mise" --version || { + if ! "$HOME/.local/bin/mise" --version; then printf "Failed to execute mise. Exiting.\n" exit 1 - } + fi + eval "$("$HOME/.local/bin/mise" activate "$current_shell")" ;; "Phoenix") mise exec -- mix local.hex --force diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh index 85c035fb..a1b79383 100755 --- a/priv/static/macOS.sh +++ b/priv/static/macOS.sh @@ -99,15 +99,15 @@ install() { exit 1 fi mkdir -p "$HOME/.local/bin" - curl -L "https://github.com/jdxcode/mise/releases/latest/download/mise-macos-$mise_arch" -o "$HOME/.local/bin/mise" + curl -fsSL "https://github.com/jdxcode/mise/releases/latest/download/mise-macos-$mise_arch" -o "$HOME/.local/bin/mise" chmod +x "$HOME/.local/bin/mise" printf 'eval "$(%s activate %s)"\n' "$HOME/.local/bin/mise" "$current_shell" >>"$config_file" - eval "$("$HOME/.local/bin/mise" activate "$current_shell")" # Verify that 'mise' is installed correctly - "$HOME/.local/bin/mise" --version || { + if ! "$HOME/.local/bin/mise" --version; then printf "Failed to execute mise. Exiting.\n" exit 1 - } + fi + eval "$("$HOME/.local/bin/mise" activate "$current_shell")" ;; "Phoenix") mise exec -- mix local.hex --force diff --git a/test/scripts/Makefile b/test/scripts/Makefile index 61eb7f34..270b85bc 100644 --- a/test/scripts/Makefile +++ b/test/scripts/Makefile @@ -2,7 +2,7 @@ SHELL := $(SHELL) current_shell := $(shell basename $(SHELL)) .ONESHELL: -.SHELLFLAGS := -eu -o pipefail -c +.SHELLFLAGS := -eu -c serve: @echo "SHELL is $(SHELL)"