Skip to content

Only set path in x64 mac installer when installing on x64 #59210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericstj merged 7 commits into from
Sep 17, 2021
Merged

Only set path in x64 mac installer when installing on x64 #59210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c314bba
Only set path in x64 mac installer when installing on x64
ericstj Sep 16, 2021
7835b8a
Remove postinstall script from hostfxr
ericstj Sep 17, 2021
6ea690a
Make postinstall set install_location on mac
ericstj Sep 17, 2021
40ac556
fix some syntax errors in script
ericstj Sep 17, 2021
b1051fb
Update src/installer/pkg/sfx/installers/dotnet-host.proj
ericstj Sep 17, 2021
a4ce610
Refine uname regular expressions
ericstj Sep 17, 2021
21045db
Merge branch 'main' into macPathX64
ericstj Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/installer/pkg/sfx/installers/dotnet-host.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<MacOSComponentNamePackType>sharedhost</MacOSComponentNamePackType>
<IncludeVersionInMacOSComponentName>false</IncludeVersionInMacOSComponentName>
<MacOSScriptsDirectory>osx_scripts/host</MacOSScriptsDirectory>
<MacOSScriptsDirectory Condition="'$(TargetArchitecture)' == 'x64">osx_scripts/host-x64</MacOSScriptsDirectory>
<MacOSPackageDescription>The .NET Shared Host.</MacOSPackageDescription>
<RpmScriptsDirectory>$(MSBuildThisFileDirectory)rpm_scripts/host</RpmScriptsDirectory>
<RpmAfterInstallScript>$(RpmScriptsDirectory)/after_install.sh</RpmAfterInstallScript>
Expand Down
3 changes: 2 additions & 1 deletion src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<OutputFilesCandleVariable>HostFxrSrc</OutputFilesCandleVariable>
<UseBrandingNameInLinuxPackageDescription>true</UseBrandingNameInLinuxPackageDescription>
<MacOSComponentNamePackType>hostfxr</MacOSComponentNamePackType>
<MacOSScriptsDirectory>osx_scripts/hostfxr</MacOSScriptsDirectory>
<MacOSScriptsDirectory>osx_scripts/host</MacOSScriptsDirectory>
<MacOSScriptsDirectory Condition="'$(TargetArchitecture)' == 'x64">osx_scripts/host-x64</MacOSScriptsDirectory>
<MacOSPackageDescription>The .NET HostFxr</MacOSPackageDescription>
</PropertyGroup>

Expand Down
22 changes: 22 additions & 0 deletions src/installer/pkg/sfx/installers/osx_scripts/host-x64/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/sh
#
# Licensed to the .NET Foundation under one or more agreements.
# The .NET Foundation licenses this file to you under the MIT license.
#

PACKAGE=$1
INSTALL_DESTINATION=$2

_machine=`uname -m`

# A temporary fix for the permissions issue(s)
chmod 755 $INSTALL_DESTINATION/dotnet

if ["$_machine" == "amd64"] || ["$_machine" == "x86_x64"]; then
# Add the installation directory to the system-wide paths
# But first create the directory if it doesn't exist
mkdir -p /etc/paths.d
echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet
fi

exit 0
16 changes: 0 additions & 16 deletions src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
View file
Open in desktop

This file was deleted.