Merge scripts with overlay

.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
     }
 

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>

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=

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=

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=

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=

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