From f75add984f1a0d73230070323a73d3f05bb8f7c2 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 14 May 2023 09:18:49 -0500
Subject: [PATCH] Cleanup distribution files

(cherry picked from commit 8b291d932f687297f18491469c44751e37e81173)
---
 .gitattributes                                      |   3 +--
 azure-pipelines.yml                                 |   4 ++--
 build.sh                                            |   6 +++---
 .../osx}/Readarr.app/Contents/Info.plist            |   0
 .../Readarr.app/Contents/Resources/readarr.icns     | Bin
 {setup => distribution/windows/setup}/readarr.iss   |   4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename {macOS => distribution/osx}/Readarr.app/Contents/Info.plist (100%)
 rename {macOS => distribution/osx}/Readarr.app/Contents/Resources/readarr.icns (100%)
 rename {setup => distribution/windows/setup}/readarr.iss (92%)

diff --git a/.gitattributes b/.gitattributes
index 94e287ce3..046a7471b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,8 +3,7 @@
 
 # Explicitly set bash scripts to have unix endings
 *.sh text eol=lf
-distribution/debian/* text eol=lf
-macOS/Readarr text eol=lf
+distribution/osx/Readarr text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2049a64af..2c75aa273 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -216,8 +216,8 @@ stages:
         displayName: Fetch Frontend
       - bash: |
           ./build.sh --packages --installer
-          cp setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
+          cp distribution/windows/setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
+          cp distribution/windows/setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
         displayName: Create Installers
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
diff --git a/build.sh b/build.sh
index abf070409..db6646b7f 100755
--- a/build.sh
+++ b/build.sh
@@ -23,7 +23,7 @@ UpdateVersionNumber()
         echo "Updating Version Info"
         sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$READARRVERSION<\/AssemblyVersion>/g" src/Directory.Build.props
         sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" src/Directory.Build.props
-        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$READARRVERSION<\/string>/g" macOS/Readarr.app/Contents/Info.plist
+        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$READARRVERSION<\/string>/g" distribution/osx/Readarr.app/Contents/Info.plist
     fi
 }
 
@@ -183,7 +183,7 @@ PackageMacOSApp()
 
     rm -rf $folder
     mkdir -p $folder
-    cp -r macOS/Readarr.app $folder
+    cp -r distribution/osx/Readarr.app $folder
     mkdir -p $folder/Readarr.app/Contents/MacOS
 
     echo "Copying Binaries"
@@ -245,7 +245,7 @@ BuildInstaller()
     local framework="$1"
     local runtime="$2"
     
-    ./_inno/ISCC.exe setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
+    ./_inno/ISCC.exe distribution/windows/setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
 }
 
 InstallInno()
diff --git a/macOS/Readarr.app/Contents/Info.plist b/distribution/osx/Readarr.app/Contents/Info.plist
similarity index 100%
rename from macOS/Readarr.app/Contents/Info.plist
rename to distribution/osx/Readarr.app/Contents/Info.plist
diff --git a/macOS/Readarr.app/Contents/Resources/readarr.icns b/distribution/osx/Readarr.app/Contents/Resources/readarr.icns
similarity index 100%
rename from macOS/Readarr.app/Contents/Resources/readarr.icns
rename to distribution/osx/Readarr.app/Contents/Resources/readarr.icns
diff --git a/setup/readarr.iss b/distribution/windows/setup/readarr.iss
similarity index 92%
rename from setup/readarr.iss
rename to distribution/windows/setup/readarr.iss
index f823b5e76..32764e12b 100644
--- a/setup/readarr.iss
+++ b/distribution/windows/setup/readarr.iss
@@ -52,8 +52,8 @@ Name: "none"; Description: "Do not start automatically"; GroupDescription: "Star
 Name: "{app}"; Permissions: users-modify
 
 [Files]
-Source: "..\_artifacts\{#Runtime}\{#Framework}\Readarr\Readarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\_artifacts\{#Runtime}\{#Framework}\Readarr\*"; Excludes: "Readarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Readarr\Readarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Readarr\*"; Excludes: "Readarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]