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

Merge pull request #517 from blackdwarf/pkgosxfix

Browse source 
Fix the PKG permission issue and change the install location
This commit is contained in:
Zlatko Knezevic 2015-12-16 20:15:13 -08:00
commit ee5cb05e35
3 changed files with 21 additions and 15 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

31
packaging/osx/scripts/postinstall
View file

@ -4,20 +4,27 @@
# 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.
# #
ln -s $2/bin/dotnet /usr/local/bin/ PACKAGE=$1
ln -s $2/bin/dotnet-compile /usr/local/bin/ INSTALL_DESTINATION=$2
ln -s $2/bin/dotnet-compile-csc /usr/local/bin/
ln -s $2/bin/dotnet-new /usr/local/bin/
ln -s $2/bin/dotnet-pack /usr/local/bin/ # A temporary fix for the permissions issue(s)
ln -s $2/bin/dotnet-publish /usr/local/bin/ chmod -R 755 $INSTALL_DESTINATION
ln -s $2/bin/dotnet-repl /usr/local/bin/
ln -s $2/bin/dotnet-restore /usr/local/bin/ ln -s $INSTALL_DESTINATION/bin/dotnet /usr/local/bin/
ln -s $2/bin/dotnet-resgen /usr/local/bin/ ln -s $INSTALL_DESTINATION/bin/dotnet-compile /usr/local/bin/
ln -s $2/bin/dotnet-run /usr/local/bin/ ln -s $INSTALL_DESTINATION/bin/dotnet-compile-csc /usr/local/bin/
ln -s $2/bin/dotnet-test /usr/local/bin/ ln -s $INSTALL_DESTINATION/bin/dotnet-new /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-pack /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-publish /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-repl /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-restore /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-resgen /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-run /usr/local/bin/
ln -s $INSTALL_DESTINATION/bin/dotnet-test /usr/local/bin/
# A temporary solution to unblock dotnet compile # A temporary solution to unblock dotnet compile
cp $2/bin/corehost /usr/local/bin/ cp $INSTALL_DESTINATION/bin/corehost /usr/local/bin/
exit 0 exit 0

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;