From da8ffec7064f073241d755840f179b95b3580ca8 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sat, 12 Jan 2019 02:00:19 +0100
Subject: [PATCH] Merge scripts with overlay

---
 .travis.yml                                                 | 6 +++---
 ArchiSteamFarm/ArchiSteamFarm.csproj                        | 4 ++--
 ArchiSteamFarm/overlay/{ => all}/config/.gitkeep            | 0
 ArchiSteamFarm/overlay/{ => all}/plugins/.gitkeep           | 0
 .../generic-netf/ArchiSteamFarm-Service.sh                  | 0
 .../{scripts => overlay}/generic-netf/ArchiSteamFarm.sh     | 0
 .../{scripts => overlay}/generic/ArchiSteamFarm-Service.sh  | 0
 .../{scripts => overlay}/generic/ArchiSteamFarm.cmd         | 0
 .../{scripts => overlay}/generic/ArchiSteamFarm.sh          | 0
 Dockerfile.Service.arm                                      | 2 +-
 Dockerfile.Service.x64                                      | 2 +-
 Dockerfile.arm                                              | 2 +-
 Dockerfile.x64                                              | 2 +-
 appveyor.yml                                                | 6 +++---
 14 files changed, 12 insertions(+), 12 deletions(-)
 rename ArchiSteamFarm/overlay/{ => all}/config/.gitkeep (100%)
 rename ArchiSteamFarm/overlay/{ => all}/plugins/.gitkeep (100%)
 rename ArchiSteamFarm/{scripts => overlay}/generic-netf/ArchiSteamFarm-Service.sh (100%)
 mode change 100755 => 100644
 rename ArchiSteamFarm/{scripts => overlay}/generic-netf/ArchiSteamFarm.sh (100%)
 mode change 100755 => 100644
 rename ArchiSteamFarm/{scripts => overlay}/generic/ArchiSteamFarm-Service.sh (100%)
 mode change 100755 => 100644
 rename ArchiSteamFarm/{scripts => overlay}/generic/ArchiSteamFarm.cmd (100%)
 mode change 100755 => 100644
 rename ArchiSteamFarm/{scripts => overlay}/generic/ArchiSteamFarm.sh (100%)
 mode change 100755 => 100644

diff --git a/.travis.yml b/.travis.yml
index 09a007fd3..0771502bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,9 +59,9 @@ script:
             dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore /nologo "/p:ASFVariant=$1"
         fi
 
-        # If we include any helper scripts for this variant, copy them to output directory
-        if [ -d "ArchiSteamFarm/scripts/${1}" ]; then
-            cp "ArchiSteamFarm/scripts/${1}/"* "ArchiSteamFarm/out/${1}"
+        # If we include any overlay for this variant, copy it to output directory
+        if [ -d "ArchiSteamFarm/overlay/${1}" ]; then
+            cp "ArchiSteamFarm/overlay/${1}/"* "ArchiSteamFarm/out/${1}"
         fi
     }
 
diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
index 3a96438f9..4c2a02dc8 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -8,7 +8,7 @@
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <CrossGenDuringPublish>false</CrossGenDuringPublish>
     <Copyright>Copyright © ArchiSteamFarm 2015-2019</Copyright>
-    <DefaultItemExcludes>$(DefaultItemExcludes);debug/**;out/**</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);config/**;debug/**;out/**;overlay/**</DefaultItemExcludes>
     <Description>ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.</Description>
     <ErrorReport>none</ErrorReport>
     <FileVersion>4.0.0.0</FileVersion>
@@ -116,7 +116,7 @@
     <None Update="UI.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="overlay\**\*.*">
+    <Content Include="overlay\all\**\*.*">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/ArchiSteamFarm/overlay/config/.gitkeep b/ArchiSteamFarm/overlay/all/config/.gitkeep
similarity index 100%
rename from ArchiSteamFarm/overlay/config/.gitkeep
rename to ArchiSteamFarm/overlay/all/config/.gitkeep
diff --git a/ArchiSteamFarm/overlay/plugins/.gitkeep b/ArchiSteamFarm/overlay/all/plugins/.gitkeep
similarity index 100%
rename from ArchiSteamFarm/overlay/plugins/.gitkeep
rename to ArchiSteamFarm/overlay/all/plugins/.gitkeep
diff --git a/ArchiSteamFarm/scripts/generic-netf/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ArchiSteamFarm/scripts/generic-netf/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/scripts/generic-netf/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ArchiSteamFarm/scripts/generic-netf/ArchiSteamFarm.sh
rename to ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh
diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh
rename to ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.cmd b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from ArchiSteamFarm/scripts/generic/ArchiSteamFarm.cmd
rename to ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd
diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh
rename to ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh
diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index 84526a0b3..760c4175a 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -17,7 +17,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
-    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
+    cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.2-runtime-stretch-slim-arm32v7 AS runtime
 ENV ASPNETCORE_URLS=
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index a1fb13d73..32f69680e 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -17,7 +17,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
-    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
+    cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.2-runtime-stretch-slim AS runtime
 ENV ASPNETCORE_URLS=
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 6db9fe494..506d76e3c 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -17,7 +17,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
-    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
+    cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.2-runtime-stretch-slim-arm32v7 AS runtime
 ENV ASPNETCORE_URLS=
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index b84a9e6be..d812eb8e7 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -17,7 +17,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
     dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
-    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
+    cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.2-runtime-stretch-slim AS runtime
 ENV ASPNETCORE_URLS=
diff --git a/appveyor.yml b/appveyor.yml
index 06628c41a..2d30aa830 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -174,9 +174,9 @@ after_test:
             throw "Last command failed."
         }
 
-        # If we include any helper scripts for this variant, copy them to output directory
-        if (Test-Path "ArchiSteamFarm\scripts\$variant" -PathType Container) {
-            Copy-Item "ArchiSteamFarm\scripts\$variant\*" "ArchiSteamFarm\out\$variant"
+        # If we include any overlay for this variant, copy it output directory
+        if (Test-Path "ArchiSteamFarm\overlay\$variant" -PathType Container) {
+            Copy-Item "ArchiSteamFarm\overlay\$variant\*" "ArchiSteamFarm\out\$variant"
         }
 
         # Until https://github.com/dotnet/cli/issues/3267 happens, we'll hack dotnet binary icon on Windows and include .ico file on other platforms