From d341084ecbceaf095ae1c03bd00628adaca1104a Mon Sep 17 00:00:00 2001 From: aidev Date: Sun, 14 Jun 2026 11:12:09 +0900 Subject: [PATCH] fix: desktop-dev-path set -e loop exit under Jenkins --- scripts/desktop-dev-path.sh | 4 +++- scripts/install-desktop-build-deps.sh | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/desktop-dev-path.sh diff --git a/scripts/desktop-dev-path.sh b/scripts/desktop-dev-path.sh old mode 100644 new mode 100755 index 6e66fff..b5f38c1 --- a/scripts/desktop-dev-path.sh +++ b/scripts/desktop-dev-path.sh @@ -11,5 +11,7 @@ prepend_path "$HOME/.cargo/bin" [[ -x "$HOME/homebrew/bin/brew" ]] && eval "$("$HOME/homebrew/bin/brew" shellenv)" [[ -x /opt/homebrew/bin/brew ]] && eval "$(/opt/homebrew/bin/brew shellenv)" for llvm in /opt/homebrew/opt/llvm/bin "$HOME/homebrew/opt/llvm/bin"; do - [[ -d "$llvm" ]] && prepend_path "$llvm" + if [[ -d "$llvm" ]]; then + prepend_path "$llvm" + fi done diff --git a/scripts/install-desktop-build-deps.sh b/scripts/install-desktop-build-deps.sh index 83eba76..d0a3198 100755 --- a/scripts/install-desktop-build-deps.sh +++ b/scripts/install-desktop-build-deps.sh @@ -26,8 +26,13 @@ prepend_path() { } for prefix in /opt/homebrew "$HOME/homebrew" /usr/local; do - [[ -x "$prefix/bin/brew" ]] && prepend_path "$prefix/bin" && prepend_path "$prefix/sbin" - [[ -d "$prefix/opt/llvm/bin" ]] && prepend_path "$prefix/opt/llvm/bin" + if [[ -x "$prefix/bin/brew" ]]; then + prepend_path "$prefix/bin" + prepend_path "$prefix/sbin" + fi + if [[ -d "$prefix/opt/llvm/bin" ]]; then + prepend_path "$prefix/opt/llvm/bin" + fi done prepend_path "$HOME/.cargo/bin"