diff --git a/build_python_framework_pkgs.zsh b/build_python_framework_pkgs.zsh index 5a23622..7360b4c 100755 --- a/build_python_framework_pkgs.zsh +++ b/build_python_framework_pkgs.zsh @@ -128,10 +128,12 @@ fi # remove existing Python package folders and recreate if [ -d "$TOOLSDIR/$TYPE" ]; then /bin/rm -rf "$TOOLSDIR/$TYPE" + /bin/mkdir -p "$TOOLSDIR/$TYPE/scripts" /bin/mkdir -p "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}" /bin/mkdir -p "$TOOLSDIR/$TYPE/payload/usr/local/bin" /usr/bin/sudo /usr/sbin/chown -R ${CONSOLEUSER}:wheel "$TOOLSDIR/$TYPE" else + /bin/mkdir -p "$TOOLSDIR/$TYPE/scripts" /bin/mkdir -p "$TOOLSDIR/$TYPE/payload${FRAMEWORKDIR}" /bin/mkdir -p "$TOOLSDIR/$TYPE/payload/usr/local/bin" /usr/bin/sudo /usr/sbin/chown -R ${CONSOLEUSER}:wheel "$TOOLSDIR/$TYPE" @@ -262,6 +264,9 @@ fi # Create outputs folder /bin/mkdir -p "$TOOLSDIR/outputs" +# +/bin/cp "${TOOLSDIR}/preinstall-cleanup" "$TOOLSDIR/$TYPE/scripts/preinstall" + if [ -n "$2" ]; then # Create the json file for munki-pkg (signed) /bin/cat << SIGNED_JSONFILE > "$TOOLSDIR/$TYPE/build-info.json" diff --git a/preinstall-cleanup b/preinstall-cleanup new file mode 100755 index 0000000..a3616ae --- /dev/null +++ b/preinstall-cleanup @@ -0,0 +1,23 @@ +#!/bin/zsh +# +# Copyright 2023-Present Mac Admins Open Source. +# +# Licensed under the Apache License, Version 2.0 (the 'License'); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an 'AS IS' BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Remove old python frameworks so we don't have a merged framework file +# containing other version of python +if [[ $3 == "/" ]] ; then + if [ -e "$3/Library/ManagedFrameworks/Python/Python3.framework" ]; then + /bin/rm -rf "$3/Library/ManagedFrameworks/Python/Python3.framework" + fi +fi