Skip to content

Commit 37974fc

Browse files
committed
bootstrap*.sh: Set PATH
This makes sure we're using system binaries, not any user overrides, from the very beginning. Also remove /usr/local/bin from the PATH in install.sh since that is user-controlled. Closes: #55 Signed-off-by: Hector Martin <[email protected]>
1 parent 92910c0 commit 37974fc

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

scripts/bootstrap-dev.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -e
55

66
export LANG=C
77
export LC_ALL=C
8+
export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
89

910
export VERSION_FLAG=https://cdn.asahilinux.org/installer-dev/latest
1011
export INSTALLER_BASE=https://cdn.asahilinux.org/installer-dev

scripts/bootstrap-prod.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -e
55

66
export LANG=C
77
export LC_ALL=C
8+
export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
89

910
export VERSION_FLAG=https://cdn.asahilinux.org/installer/latest
1011
export INSTALLER_BASE=https://cdn.asahilinux.org/installer

scripts/bootstrap.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -e
55

66
export LANG=C
77
export LC_ALL=C
8+
export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
89

910
export INSTALLER_BASE=http://localhost:5000
1011
export INSTALLER_DATA=http://localhost:5000/data/installer_data.json

src/install.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ export DYLD_LIBRARY_PATH=$PWD/Frameworks/Python.framework/Versions/Current/lib
1010
export DYLD_FRAMEWORK_PATH=$PWD/Frameworks
1111
python=Frameworks/Python.framework/Versions/3.9/bin/python3.9
1212
export SSL_CERT_FILE=$PWD/Frameworks/Python.framework/Versions/Current/etc/openssl/cert.pem
13-
export PATH="$PWD/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
13+
# Bootstrap does part of this, but install.sh can be run standalone
14+
# so do it again for good measure.
15+
export PATH="$PWD/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
1416

1517
arch=
1618

0 commit comments

Comments
 (0)