Fixed: Update build.sh to fix macOS startup script issues (#565)

.gitignore

@@ -113,6 +113,7 @@ src/UI/.idea/*
 *log.txt
 node_modules/
 _output*
+_artifacts
 _rawPackage/
 _dotTrace*
 _tests/

appveyor-package.sh

@@ -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

appveyor.yml

@@ -1,6 +1,6 @@
 version: '0.5.0.{build}'
 
-image: Previous Visual Studio 2017
+image: Visual Studio 2017
 
 assembly_info:
   patch: true

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
+
+    echo "Adding Startup script"
+    cp ./macOS/Lidarr $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
+    dos2unix $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr
+
+    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
 
-    cp -r ./osx/Lidarr.app $outputFolderMacOSApp
+    echo "Removing Update Folder"
-    cp -r $outputFolderMacOS $outputFolderMacOSApp/Lidarr.app/Contents/MacOS
+    rm -r $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr.Update
 
-    ProgressEnd 'Creating MacOS App Package'
+    ProgressEnd 'Creating macOS App Package'
 }
 
 PackageTests()
@@ -311,8 +332,8 @@ esac
 Build
 RunGulp
 PackageMono
-PackageOsx
+PackageMacOS
-PackageOsxApp
+PackageMacOSApp
 PackageTests
 CleanupWindowsPackage
 PackageArtifacts