diff --git a/.github/workflows/install-script.yml b/.github/workflows/install-script.yml index e04d09cb..b37874b2 100644 --- a/.github/workflows/install-script.yml +++ b/.github/workflows/install-script.yml @@ -43,7 +43,6 @@ jobs: CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" mkdir -p "${CARGO_HOME}/bin" echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - echo "${CARGO_HOME}/bin" >> $GITHUB_PATH - name: Install `cargo-binstall` using scripts run: ./install-from-binstall-release.sh @@ -73,7 +72,6 @@ jobs: CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" mkdir -p "${CARGO_HOME}/bin" echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - echo "${CARGO_HOME}/bin" >> $GITHUB_PATH - name: Install `cargo-binstall` using scripts run: ./install-from-binstall-release.ps1 @@ -101,7 +99,6 @@ jobs: CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" mkdir -p "${CARGO_HOME}/bin" echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - echo "${CARGO_HOME}/bin" >> $GITHUB_PATH - name: Install `cargo-binstall` using scripts shell: bash diff --git a/install-from-binstall-release.ps1 b/install-from-binstall-release.ps1 index b6c60f13..a06b25e4 100644 --- a/install-from-binstall-release.ps1 +++ b/install-from-binstall-release.ps1 @@ -20,7 +20,11 @@ Remove-Item -Force $tmpdir\cargo-binstall.zip Remove-Item -Recurse -Force $tmpdir\cargo-binstall $cargo_home = if ($Env:CARGO_HOME -ne $null) { $Env:CARGO_HOME } else { "$HOME\.cargo" } if ($Env:Path -split ";" -notcontains "$cargo_home\bin") { - Write-Host "" - Write-Host "Your path is missing $cargo_home\bin, you might want to add it." -ForegroundColor Red - Write-Host "" + if (($Env:CI -ne $null) -and ($Env:GITHUB_PATH -ne $null)) { + Add-Content -Path "$Env:GITHUB_PATH" -Value "$cargo_home\bin" + } else { + Write-Host "" + Write-Host "Your path is missing $cargo_home\bin, you might want to add it." -ForegroundColor Red + Write-Host "" + } } diff --git a/install-from-binstall-release.sh b/install-from-binstall-release.sh index 90686cba..57305c3e 100755 --- a/install-from-binstall-release.sh +++ b/install-from-binstall-release.sh @@ -36,7 +36,11 @@ fi CARGO_HOME="${CARGO_HOME:-$HOME/.cargo}" if ! [[ ":$PATH:" == *":$CARGO_HOME/bin:"* ]]; then - echo - printf "\033[0;31mYour path is missing %s, you might want to add it.\033[0m\n" "$CARGO_HOME/bin" - echo + if [ -n "$CI" ] && [ -n "$GITHUB_PATH" ]; then + echo "$CARGO_HOME/bin" >> "$GITHUB_PATH" + else + echo + printf "\033[0;31mYour path is missing %s, you might want to add it.\033[0m\n" "$CARGO_HOME/bin" + echo + fi fi