From e00e615b02941d2cd078bcc8427f79b7dcff866d Mon Sep 17 00:00:00 2001 From: JustArchi Date: Wed, 6 Jan 2021 20:43:51 +0100 Subject: [PATCH] Misc --- .github/workflows/ci.yml | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.Service | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f0886b80..cb4ccbbf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,7 +129,7 @@ jobs: # If we're including any overlay for this variant, copy it to output directory if [ -d "ArchiSteamFarm/overlay/${1}" ]; then - cp "ArchiSteamFarm/overlay/${1}/"* "out/${1}" + cp -pR "ArchiSteamFarm/overlay/${1}/"* "out/${1}" fi # If we're including SteamTokenDumper plugin for this framework, copy it to output directory diff --git a/.travis.yml b/.travis.yml index b8b2c3215..6dac07c38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ script: # If we're including any overlay for this variant, copy it to output directory if [ -d "ArchiSteamFarm/overlay/${1}" ]; then - cp "ArchiSteamFarm/overlay/${1}/"* "out/${1}" + cp -pR "ArchiSteamFarm/overlay/${1}/"* "out/${1}" fi # If we're including SteamTokenDumper plugin for this framework, copy it to output directory diff --git a/Dockerfile b/Dockerfile index 152f95315..7535755dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN dotnet --info && \ dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r "$asf_variant" --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r "$asf_variant" --nologo && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r "$asf_variant" --nologo && \ - if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp -pR "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ if [ -d "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp -pR "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/"* "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:5.0${IMAGESUFFIX} AS runtime diff --git a/Dockerfile.Service b/Dockerfile.Service index 984297ce9..2d645d7e6 100644 --- a/Dockerfile.Service +++ b/Dockerfile.Service @@ -41,7 +41,7 @@ RUN dotnet --info && \ dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r "$asf_variant" --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r "$asf_variant" --nologo && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" "-p:ASFVariant=${asf_variant}" -p:PublishSingleFile=true -p:PublishTrimmed=true -r "$asf_variant" --nologo && \ - if [ -d "ArchiSteamFarm/overlay/${asf_variant}" ]; then cp "ArchiSteamFarm/overlay/${asf_variant}/"* "out/result"; fi && \ + if [ -d "ArchiSteamFarm/overlay/${asf_variant}" ]; then cp -pR "ArchiSteamFarm/overlay/${asf_variant}/"* "out/result"; fi && \ if [ -d "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp -pR "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/"* "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:5.0${IMAGESUFFIX} AS runtime