From 1260b52c9806cd65c4bc4228dbe19dcc25fa5495 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 13 Sep 2020 11:36:02 +0200 Subject: [PATCH] Disable deployed build Deployed builds show a ~5s splash screen at startup, send errors caused by using it inside a docker container to the developers. This patches osu to show the version number but not enabling the other things. --- Dockerfile | 3 +++ disable-deployed-build.patch | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 disable-deployed-build.patch diff --git a/Dockerfile b/Dockerfile index ed45077..be4ad86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,15 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 RUN apt-get update \ && apt-get -y install jq +COPY disable-deployed-build.patch /tmp/ + ARG CACHEBUST=1 RUN OSU_VERSION=$(curl -s https://api.github.com/repos/ppy/osu/releases/latest | jq -r .tag_name) \ && git clone --depth=1 --single-branch -b ${OSU_VERSION} https://github.com/ppy/osu \ && cd osu \ && curl https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/games/osu-lazer/bypass-tamper-detection.patch | git apply \ + && git apply /tmp/disable-deployed-build.patch \ && dotnet publish \ -c Release \ -r linux-x64 \ diff --git a/disable-deployed-build.patch b/disable-deployed-build.patch new file mode 100644 index 0000000..cdc4abb --- /dev/null +++ b/disable-deployed-build.patch @@ -0,0 +1,21 @@ +diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs +index b1269e9..efeefa6 100644 +--- a/osu.Game/OsuGameBase.cs ++++ b/osu.Game/OsuGameBase.cs +@@ -109,15 +109,12 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles + /// + public string VersionHash { get; private set; } + +- public bool IsDeployedBuild => AssemblyVersion.Major > 0; ++ public bool IsDeployedBuild => false; + + public virtual string Version + { + get + { +- if (!IsDeployedBuild) +- return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release"); +- + var version = AssemblyVersion; + return $@"{version.Major}.{version.Minor}.{version.Build}"; + }