mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)

Browse Source 
Avoid masking the system /usr/bin/python by calling our symlink
"munki-python" instead of "python".

Closes #996
This commit is contained in:
David Aguilar
2020-07-07 13:58:34 -07:00
committed by GitHub
parent 361b18bcc5
commit 3bb91cabca
17 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/tools/make_munki_mpkg.sh
View File

@@ -539,7 +539,7 @@ chmod -R 755 "$PYTHONROOT/usr"
# Copy framework
cp -R "$MUNKIROOT/Python.framework" "$PYTHONROOT/usr/local/munki/"
# Create symlink
ln -s Python.framework/Versions/3.7/bin/python3 "$PYTHONROOT/usr/local/munki/python"
ln -s Python.framework/Versions/3.7/bin/python3 "$PYTHONROOT/usr/local/munki/munki-python"
# Set permissions.
chmod -R go-w "$PYTHONROOT/usr/local/munki"
chmod +x "$PYTHONROOT/usr/local/munki"
@@ -560,7 +560,7 @@ mkdir -m 1775 "$NOPYTHONROOT"
mkdir -p "$NOPYTHONROOT/usr/local/munki"
chmod -R 755 "$NOPYTHONROOT/usr"
# Create symlink
ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/python"
ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/munki-python"
# Set permissions.
chmod -R go-w "$NOPYTHONROOT/usr/local/munki"
chmod +x "$NOPYTHONROOT/usr/local/munki"

4
code/tools/make_munki_mpkg_DEP.sh
View File

@@ -550,7 +550,7 @@ chmod -R 755 "$PYTHONROOT/usr"
# Copy framework
cp -R "$MUNKIROOT/Python.framework" "$PYTHONROOT/usr/local/munki/"
# Create symlink
ln -s Python.framework/Versions/3.7/bin/python3 "$PYTHONROOT/usr/local/munki/python"
ln -s Python.framework/Versions/3.7/bin/python3 "$PYTHONROOT/usr/local/munki/munki-python"
# Set permissions.
chmod -R go-w "$PYTHONROOT/usr/local/munki"
chmod +x "$PYTHONROOT/usr/local/munki"
@@ -571,7 +571,7 @@ mkdir -m 1775 "$NOPYTHONROOT"
mkdir -p "$NOPYTHONROOT/usr/local/munki"
chmod -R 755 "$NOPYTHONROOT/usr"
# Create symlink
ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/python"
ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/munki-python"
# Set permissions.
chmod -R go-w "$NOPYTHONROOT/usr/local/munki"
chmod +x "$NOPYTHONROOT/usr/local/munki"