actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 06:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

move homebrew to the end (#789)

Browse Source
This commit is contained in:
Mikhail Timofeev
2020-04-28 07:26:29 +00:00
committed by GitHub
parent 5896eb6ac6
commit 792da139c9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/linux/scripts/helpers/etc-environment.sh
View File

@@ -61,6 +61,11 @@ function prependEtcEnvironmentPath {
prependEtcEnvironmentVariable PATH "${element}" prependEtcEnvironmentVariable PATH "${element}"
} }
function appendEtcEnvironmentPath {
element="$1"
appendEtcEnvironmentVariable PATH "${element}"
}
# Process /etc/environment as if it were shell script with `export VAR=...` expressions # Process /etc/environment as if it were shell script with `export VAR=...` expressions
# The PATH variable is handled specially in order to do not override the existing PATH # The PATH variable is handled specially in order to do not override the existing PATH
# variable. The value of PATH variable read from /etc/environment is added to the end # variable. The value of PATH variable read from /etc/environment is added to the end

2
images/linux/scripts/installers/homebrew.sh
View File

@@ -20,7 +20,7 @@ sudo chmod -R o+w $HOMEBREW_PREFIX
brew shellenv|grep 'export HOMEBREW'|sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment brew shellenv|grep 'export HOMEBREW'|sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment
# add brew executables locations to PATH # add brew executables locations to PATH
brew_path=$(brew shellenv|grep '^export PATH' |sed -E 's/^export PATH="([^$]+)\$.*/\1/') brew_path=$(brew shellenv|grep '^export PATH' |sed -E 's/^export PATH="([^$]+)\$.*/\1/')
prependEtcEnvironmentPath "$brew_path" appendEtcEnvironmentPath "$brew_path"
# Validate the installation ad hoc # Validate the installation ad hoc
echo "Validate the installation reloading /etc/environment" echo "Validate the installation reloading /etc/environment"