mirror of https://github.com/lidarr/Lidarr
Fixed: Update build.sh to fix macOS startup script issues (#565)
This commit is contained in:
parent
5c0643d76d
commit
24bdb5a891
|
@ -113,6 +113,7 @@ src/UI/.idea/*
|
|||
*log.txt
|
||||
node_modules/
|
||||
_output*
|
||||
_artifacts
|
||||
_rawPackage/
|
||||
_dotTrace*
|
||||
_tests/
|
||||
|
|
|
@ -11,18 +11,10 @@ PublishArtifacts()
|
|||
7z a $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.windows.zip $artifactsFolderWindows/*
|
||||
|
||||
7z a $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx-app.zip $artifactsFolderMacOSApp/*
|
||||
mkdir -p $artifactsFolderMacOSApp/StartScript/Lidarr.app/Contents/MacOS
|
||||
cp ./osx/Lidarr $artifactsFolderMacOSApp/StartScript/Lidarr.app/Contents/MacOS
|
||||
7z a $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx-app.zip $artifactsFolderMacOSApp/StartScript/*
|
||||
rm -rf $artifactsFolderMacOSApp/StartScript/
|
||||
|
||||
7z a -ttar $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx.tar $artifactsFolderMacOS/*
|
||||
mkdir -p $artifactsFolderMacOS/StartScript/Lidarr
|
||||
cp ./osx/Lidarr $artifactsFolderMacOS/StartScript/Lidarr/Lidarr
|
||||
7z a -ttar $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx.tar $artifactsFolderMacOS/StartScript/*
|
||||
7z a -tgzip $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx.tar.gz $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx.tar
|
||||
rm -f $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.osx.tar
|
||||
rm -rf $artifactsFolderMacOS/StartScript/
|
||||
|
||||
7z a -ttar $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.linux.tar $artifactsFolderLinux/*
|
||||
7z a -tgzip $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.linux.tar.gz $artifactsFolder/Lidarr.${APPVEYOR_REPO_BRANCH}.${APPVEYOR_BUILD_VERSION}.linux.tar
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
version: '0.5.0.{build}'
|
||||
|
||||
image: Previous Visual Studio 2017
|
||||
image: Visual Studio 2017
|
||||
|
||||
assembly_info:
|
||||
patch: true
|
||||
|
|
45
build.sh
45
build.sh
|
@ -156,6 +156,8 @@ PackageMono()
|
|||
ProgressStart 'Creating Mono Package'
|
||||
|
||||
rm -rf $outputFolderLinux
|
||||
|
||||
echo "Copying Binaries"
|
||||
cp -r $outputFolder $outputFolderLinux
|
||||
|
||||
echo "Creating MDBs"
|
||||
|
@ -193,12 +195,19 @@ PackageMono()
|
|||
ProgressEnd 'Creating Mono Package'
|
||||
}
|
||||
|
||||
PackageOsx()
|
||||
PackageMacOS()
|
||||
{
|
||||
ProgressStart 'Creating MacOS Package'
|
||||
|
||||
rm -rf $outputFolderMacOS
|
||||
cp -r $outputFolderLinux $outputFolderMacOS
|
||||
mkdir $outputFolderMacOS
|
||||
|
||||
echo "Adding Startup script"
|
||||
cp ./macOS/Lidarr $outputFolderMacOS
|
||||
dos2unix $outputFolderMacOS/Lidarr
|
||||
|
||||
echo "Copying Binaries"
|
||||
cp -r $outputFolderLinux/* $outputFolderMacOS
|
||||
|
||||
echo "Adding sqlite dylibs"
|
||||
cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOS
|
||||
|
@ -206,23 +215,35 @@ PackageOsx()
|
|||
echo "Adding MediaInfo dylib"
|
||||
cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOS
|
||||
|
||||
echo "Adding Startup script"
|
||||
cp ./osx/Lidarr $outputFolderMacOS
|
||||
|
||||
ProgressEnd 'Creating MacOS Package'
|
||||
}
|
||||
|
||||
PackageOsxApp()
|
||||
PackageMacOSApp()
|
||||
{
|
||||
ProgressStart 'Creating MacOS App Package'
|
||||
ProgressStart 'Creating macOS App Package'
|
||||
|
||||
rm -rf $outputFolderMacOSApp
|
||||
mkdir $outputFolderMacOSApp
|
||||
cp -r ./macOS/Lidarr.app $outputFolderMacOSApp
|
||||
mkdir -p $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
|
||||
cp -r ./osx/Lidarr.app $outputFolderMacOSApp
|
||||
cp -r $outputFolderMacOS $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
echo "Adding Startup script"
|
||||
cp ./macOS/Lidarr $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
dos2unix $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr
|
||||
|
||||
ProgressEnd 'Creating MacOS App Package'
|
||||
echo "Copying Binaries"
|
||||
cp -r $outputFolderLinux/* $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
|
||||
echo "Adding sqlite dylibs"
|
||||
cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
|
||||
echo "Adding MediaInfo dylib"
|
||||
cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
|
||||
|
||||
echo "Removing Update Folder"
|
||||
rm -r $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr.Update
|
||||
|
||||
ProgressEnd 'Creating macOS App Package'
|
||||
}
|
||||
|
||||
PackageTests()
|
||||
|
@ -311,8 +332,8 @@ esac
|
|||
Build
|
||||
RunGulp
|
||||
PackageMono
|
||||
PackageOsx
|
||||
PackageOsxApp
|
||||
PackageMacOS
|
||||
PackageMacOSApp
|
||||
PackageTests
|
||||
CleanupWindowsPackage
|
||||
PackageArtifacts
|
||||
|
|
Loading…
Reference in New Issue