From 524a1a41a47558261d29ae51102be547331d431c Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Tue, 19 Jul 2022 21:01:26 +0200
Subject: [PATCH] Try to make it more reliable

---
 ArchiSteamFarm/ArchiSteamFarm.csproj                 | 12 ++++--------
 .../overlay/{ => os}/linux/ArchiSteamFarm-Service.sh |  0
 .../overlay/{ => os}/linux/ArchiSteamFarm@.service   |  0
 .../overlay/{ => os}/osx/ArchiSteamFarm-Service.sh   |  0
 .../generic-netf/ArchiSteamFarm-Service.sh           |  0
 .../{ => variant}/generic-netf/ArchiSteamFarm.sh     |  0
 .../generic-netf/ArchiSteamFarm@.service             |  0
 .../{ => variant}/generic/ArchiSteamFarm-Service.sh  |  0
 .../overlay/{ => variant}/generic/ArchiSteamFarm.cmd |  0
 .../overlay/{ => variant}/generic/ArchiSteamFarm.sh  |  0
 .../{ => variant}/generic/ArchiSteamFarm@.service    |  0
 11 files changed, 4 insertions(+), 8 deletions(-)
 rename ArchiSteamFarm/overlay/{ => os}/linux/ArchiSteamFarm-Service.sh (100%)
 rename ArchiSteamFarm/overlay/{ => os}/linux/ArchiSteamFarm@.service (100%)
 rename ArchiSteamFarm/overlay/{ => os}/osx/ArchiSteamFarm-Service.sh (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic-netf/ArchiSteamFarm-Service.sh (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic-netf/ArchiSteamFarm.sh (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic-netf/ArchiSteamFarm@.service (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic/ArchiSteamFarm-Service.sh (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic/ArchiSteamFarm.cmd (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic/ArchiSteamFarm.sh (100%)
 rename ArchiSteamFarm/overlay/{ => variant}/generic/ArchiSteamFarm@.service (100%)

diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
index a0987fbb6..8b3c5d9f7 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -79,23 +79,19 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup Condition="Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant.Split('-')[0]))))">
-		<Content Include="overlay/$(ASFVariant.Split('-')[0])/**/*.*">
+	<ItemGroup Condition="Exists("overlay\os\$(ASFVariant.Split('-')[0])")">
+		<Content Include="overlay\os\$(ASFVariant.Split('-')[0])\**\*.*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 			<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup Condition="Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant))))">
-		<Content Include="overlay/$(ASFVariant)/**/*.*">
+	<ItemGroup Condition="Exists("overlay\variant\$(ASFVariant)")">
+		<Content Include="overlay\variant\$(ASFVariant)\**\*.*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 			<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
 		</Content>
 	</ItemGroup>
-
-	<PropertyGroup Condition="Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant.Split('-')[0])))) And Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant))))">
-		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-	</PropertyGroup>
 </Project>
diff --git a/ArchiSteamFarm/overlay/linux/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/os/linux/ArchiSteamFarm-Service.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/linux/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/os/linux/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/linux/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/os/linux/ArchiSteamFarm@.service
similarity index 100%
rename from ArchiSteamFarm/overlay/linux/ArchiSteamFarm@.service
rename to ArchiSteamFarm/overlay/os/linux/ArchiSteamFarm@.service
diff --git a/ArchiSteamFarm/overlay/osx/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/os/osx/ArchiSteamFarm-Service.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/osx/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/os/osx/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm-Service.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh
rename to ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm.sh
diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm@.service
similarity index 100%
rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm@.service
rename to ArchiSteamFarm/overlay/variant/generic-netf/ArchiSteamFarm@.service
diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm-Service.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd b/ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm.cmd
similarity index 100%
rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd
rename to ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm.cmd
diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm.sh
similarity index 100%
rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh
rename to ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm.sh
diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm@.service
similarity index 100%
rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm@.service
rename to ArchiSteamFarm/overlay/variant/generic/ArchiSteamFarm@.service