diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 872a152..b7e05dc 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -60,8 +60,21 @@ jobs: - name: 安装 Rust run: | set -eux - PATH_WITHOUT_CARGO_BIN="$(printf '%s' "$PATH" | awk -v RS=: -v ORS=: '$0 != ENVIRON["HOME"] \"/.cargo/bin\" { print }' | sed 's/:$//')" - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${PATH_WITHOUT_CARGO_BIN:+:$PATH_WITHOUT_CARGO_BIN}" + PATH_BASE="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + PATH_EXTRA="" + OLD_IFS="$IFS" + IFS=':' + set -- $PATH + IFS="$OLD_IFS" + for entry in "$@"; do + [ -n "$entry" ] || continue + [ "$entry" = "$HOME/.cargo/bin" ] && continue + case ":$PATH_BASE:$PATH_EXTRA:" in + *":$entry:"*) continue ;; + esac + PATH_EXTRA="${PATH_EXTRA:+$PATH_EXTRA:}$entry" + done + export PATH="$PATH_BASE${PATH_EXTRA:+:$PATH_EXTRA}" if ! command -v cargo >/dev/null 2>&1 || ! command -v rustc >/dev/null 2>&1; then [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" fi @@ -78,8 +91,21 @@ jobs: - name: 构建发布包 run: | set -eux - PATH_WITHOUT_CARGO_BIN="$(printf '%s' "$PATH" | awk -v RS=: -v ORS=: '$0 != ENVIRON["HOME"] \"/.cargo/bin\" { print }' | sed 's/:$//')" - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${PATH_WITHOUT_CARGO_BIN:+:$PATH_WITHOUT_CARGO_BIN}" + PATH_BASE="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + PATH_EXTRA="" + OLD_IFS="$IFS" + IFS=':' + set -- $PATH + IFS="$OLD_IFS" + for entry in "$@"; do + [ -n "$entry" ] || continue + [ "$entry" = "$HOME/.cargo/bin" ] && continue + case ":$PATH_BASE:$PATH_EXTRA:" in + *":$entry:"*) continue ;; + esac + PATH_EXTRA="${PATH_EXTRA:+$PATH_EXTRA:}$entry" + done + export PATH="$PATH_BASE${PATH_EXTRA:+:$PATH_EXTRA}" if ! command -v cargo >/dev/null 2>&1 || ! command -v rustc >/dev/null 2>&1; then [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" fi