Skip to content

Commit 404de1a

Browse files
add architecture to script
1 parent 256e6dd commit 404de1a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

builders/macos-python-builder.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ class macOSPythonBuilder : NixPythonBuilder {
151151
$variablesToReplace = @{
152152
"{{__VERSION_FULL__}}" = $this.Version;
153153
"{{__PKG_NAME__}}" = $this.GetPkgName();
154+
"{__ARCHITECTURE__}" = $this.Architecture;
154155
}
155156

156157
$variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) }

installers/macos-pkg-setup-template.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ set -e
22

33
PYTHON_FULL_VERSION="{{__VERSION_FULL__}}"
44
PYTHON_PKG_NAME="{{__PKG_NAME__}}"
5+
$ARCHITECTURE = "{{__ARCHITECTURE__}}"
56
MAJOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 1)
67
MINOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 2)
78

@@ -18,7 +19,7 @@ fi
1819

1920
PYTHON_TOOLCACHE_PATH=$TOOLCACHE_ROOT/Python
2021
PYTHON_TOOLCACHE_VERSION_PATH=$PYTHON_TOOLCACHE_PATH/$PYTHON_FULL_VERSION
21-
PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/x64
22+
PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/$ARCHITECTURE
2223
PYTHON_FRAMEWORK_PATH="/Library/Frameworks/Python.framework/Versions/${MAJOR_VERSION}.${MINOR_VERSION}"
2324
PYTHON_APPLICATION_PATH="/Applications/Python ${MAJOR_VERSION}.${MINOR_VERSION}"
2425

@@ -29,10 +30,10 @@ if [ ! -d $PYTHON_TOOLCACHE_PATH ]; then
2930
else
3031
# remove ALL other directories for same major.minor python versions
3132
find $PYTHON_TOOLCACHE_PATH -name "${MAJOR_VERSION}.${MINOR_VERSION}.*"|while read python_version;do
32-
python_version_x64="$python_version/x64"
33-
if [ -e "$python_version_x64" ];then
34-
echo "Deleting Python $python_version_x64"
35-
rm -rf "$python_version_x64"
33+
python_version_arch="$python_version/$ARCHITECTURE"
34+
if [ -e "$python_version_arch" ];then
35+
echo "Deleting Python $python_version_arch"
36+
rm -rf "$python_version_arch"
3637
fi
3738
done
3839
fi
@@ -75,4 +76,4 @@ echo "Install OpenSSL certificates"
7576
sh -e "${PYTHON_APPLICATION_PATH}/Install Certificates.command"
7677

7778
echo "Create complete file"
78-
touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete
79+
touch $PYTHON_TOOLCACHE_VERSION_PATH/$ARCHITECTURE.complete

0 commit comments

Comments
 (0)