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

This change is still a good future goal, but is causing problems that are too difficult to work around right now and is delaying the vital release of Munki 5.1 for Big Sur compatibility.

This reverts commit 3bb91cabca.

code/client/app_usage_monitor

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2017-2020 Greg Neagle.

code/client/appusaged

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2018-2020 Greg Neagle.

code/client/authrestartd

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2017-2020 Greg Neagle.

code/client/iconimporter

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.

code/client/launchapp

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.

code/client/logouthelper

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2020 Greg Neagle.

code/client/makepkginfo

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2008-2020 Greg Neagle.

code/client/managedsoftwareupdate

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2009-2020 Greg Neagle.

code/client/manifestutil

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2020 Greg Neagle.

code/client/munkiimport

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.

code/client/precache_agent

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2018-2020 Greg Neagle.

code/client/ptyexec

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2017 Google Inc. All Rights Reserved.

code/client/removepackages

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2009-2020 Greg Neagle.

code/client/supervisor

@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2013 Google Inc. All Rights Reserved.

code/tools/make_munki_mpkg.sh

@@ -568,7 +568,7 @@ chmod -R 755 "$PYTHONROOT/usr"
 # Copy framework
 cp -R "$MUNKIROOT/Python.framework" "$PYTHONROOT/usr/local/munki/"
 # Create symlink
-ln -s Python.framework/Versions/Current/bin/python3 "$PYTHONROOT/usr/local/munki/munki-python"
+ln -s Python.framework/Versions/Current/bin/python3 "$PYTHONROOT/usr/local/munki/python"
 # Set permissions.
 chmod -R go-w "$PYTHONROOT/usr/local/munki"
 chmod +x "$PYTHONROOT/usr/local/munki"
@@ -587,7 +587,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/munki-python"
+ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/python"
 # Set permissions.
 chmod -R go-w "$NOPYTHONROOT/usr/local/munki"
 chmod +x "$NOPYTHONROOT/usr/local/munki"

code/tools/pkgresources/Scripts_python/postinstall

@@ -3,5 +3,4 @@
 # removes old versions when installing/upgrading the Python framework.
 # will need to be updated if/when we move to Python 3.9
 
-/bin/rm -rf "$3/usr/local/munki/Python.framework/Versions/3.7"
-/bin/rm -f "$3/usr/local/munki/python"
+/bin/rm -rf "$3/usr/local/munki/Python.framework/Versions/3.7"