aidev/goldenChart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: desktop-dev-path set -e loop exit under Jenkins

Browse Source
This commit is contained in:
aidev
2026-06-14 11:12:09 +09:00
parent 9636bd2abf
commit d341084ecb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/desktop-dev-path.sh
Regular → Executable
+3 -1
View File
@@ -11,5 +11,7 @@ prepend_path "$HOME/.cargo/bin"
[[ -x "$HOME/homebrew/bin/brew" ]] && eval "$("$HOME/homebrew/bin/brew" shellenv)" [[ -x "$HOME/homebrew/bin/brew" ]] && eval "$("$HOME/homebrew/bin/brew" shellenv)"
[[ -x /opt/homebrew/bin/brew ]] && eval "$(/opt/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 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 done
scripts/install-desktop-build-deps.sh
+7 -2
View File
@@ -26,8 +26,13 @@ prepend_path() {
} }
for prefix in /opt/homebrew "$HOME/homebrew" /usr/local; do for prefix in /opt/homebrew "$HOME/homebrew" /usr/local; do
[[ -x "$prefix/bin/brew" ]] && prepend_path "$prefix/bin" && prepend_path "$prefix/sbin" if [[ -x "$prefix/bin/brew" ]]; then
[[ -d "$prefix/opt/llvm/bin" ]] && prepend_path "$prefix/opt/llvm/bin" prepend_path "$prefix/bin"
prepend_path "$prefix/sbin"
fi
if [[ -d "$prefix/opt/llvm/bin" ]]; then
prepend_path "$prefix/opt/llvm/bin"
fi
done done
prepend_path "$HOME/.cargo/bin" prepend_path "$HOME/.cargo/bin"