mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix the PKG permission issue and change the install location

Browse source 
A temporary fix for the PKG permission issue by using chmod -R 755 in the postinstall
script. Change the install location to remove the "cli" part of the path. Also
change the corehost to reflect this change.

Fixes #492 and #390
This commit is contained in:
Zlatko Knezevic 2015-12-15 14:08:00 -08:00
parent d17dff0647
commit 5ef832ee94
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packaging/osx/package-osx.sh
View file

@ -41,9 +41,8 @@ PACKAGE_NAME=$PACKAGE_DIR/dotnet-cli-x64.${DOTNET_BUILD_VERSION}.pkg
pkgbuild --root $STAGE2_DIR \ pkgbuild --root $STAGE2_DIR \
--version $DOTNET_BUILD_VERSION \ --version $DOTNET_BUILD_VERSION \
--scripts $DIR/scripts \ --scripts $DIR/scripts \
--ownership preserve \
--identifier com.microsoft.dotnet.cli.pkg.dotnet-osx-x64 \ --identifier com.microsoft.dotnet.cli.pkg.dotnet-osx-x64 \
--install-location /usr/local/share/dotnet/cli \ --install-location /usr/local/share/dotnet \
$DIR/dotnet-osx-x64.$DOTNET_BUILD_VERSION.pkg $DIR/dotnet-osx-x64.$DOTNET_BUILD_VERSION.pkg
cat $DIR/Distribution-Template | sed "/{VERSION}/s//$DOTNET_BUILD_VERSION/g" > $DIR/Dist cat $DIR/Distribution-Template | sed "/{VERSION}/s//$DOTNET_BUILD_VERSION/g" > $DIR/Dist

3
packaging/osx/scripts/postinstall
View file

@ -4,6 +4,9 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information. # Licensed under the MIT license. See LICENSE file in the project root for full license information.
# #
# A temporary fix for the permissions issue(s)
chmod -R 755 $2
ln -s $2/bin/dotnet /usr/local/bin/ ln -s $2/bin/dotnet /usr/local/bin/
ln -s $2/bin/dotnet-compile /usr/local/bin/ ln -s $2/bin/dotnet-compile /usr/local/bin/
ln -s $2/bin/dotnet-compile-csc /usr/local/bin/ ln -s $2/bin/dotnet-compile-csc /usr/local/bin/

2
src/corehost/src/pal.unix.cpp
View file

@ -32,7 +32,7 @@ bool pal::find_coreclr(pal::string_t& recv)
return true; return true;
} }
candidate.assign("/usr/local/share/dotnet/cli/runtime/coreclr"); candidate.assign("/usr/local/share/dotnet/runtime/coreclr");
if (coreclr_exists_in_dir(candidate)) { if (coreclr_exists_in_dir(candidate)) {
recv.assign(candidate); recv.assign(candidate);
return true; return true;