diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 831a0e4ce..86d3f1c31 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -24,7 +24,7 @@ read_scripts() { xargs -0 -r awk -v want="${1:-redists}" ' proc[depth] = 1 program = tolower(part[4]) sub(/.*[\\\/]/, "", program) - if (program ~ /vulkan/) vulkan[depth] = 1 + if (program ~ /vulkan|uplay|ubisoft/) vulkan[depth] = 1 next } if (n == 3) pending = part[2] @@ -243,7 +243,7 @@ for system in "${regs[@]}"; do had=() for line in "${kept[@]}"; do had[$line]=1; done printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime markers out of $reg" + echo "== took Vulkan runtime and Ubisoft Connect markers out of $reg" fi if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then declare -A held=() diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 042ab87d4..bc71403f8 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -45,6 +45,26 @@ VULKAN_SCRIPT = r'''"InstallScript" ''' +UBISOFT_SCRIPT = r'''"installscript" +{ + "Run Process" + { + "Ubisoft Connect PC Client" + { + "process 1" "%INSTALLDIR%\\UbisoftConnectInstaller.exe" + "command 1" "/S" + } + "easyanticheat" + { + "HasRunKey" "HKEY_CURRENT_USER\\SOFTWARE\\Ubisoft\\WatchDogs2EAC" + "process 1" "%INSTALLDIR%\\EasyAntiCheat\\InstallWD2EAC.cmd" + "command 1" "" + } + } +} +''' + + class SeedRedistsTest(unittest.TestCase): def setUp(self): self.tmp = Path(tempfile.mkdtemp()) @@ -353,5 +373,33 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def ubisoft(self): + script = self.tmp / "legacycompat/evaluatorscript_447040.vdf" + script.parent.mkdir(parents=True) + script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"447040"\n\t"1"\n' + + "\n".join("\t" + line for line in UBISOFT_SCRIPT.splitlines()) + "\n}\n") + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(script)) + return subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + + def test_the_ubisoft_connect_installer_is_left_to_run(self): + self.ubisoft() + self.assertIn('"easyanticheat"=dword:00000001', self.user.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_a_ubisoft_connect_marker_an_earlier_seeding_wrote_comes_out(self): + marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\447040\tUbisoft Connect PC Client" + self.reg.write_text( + "WINE REGISTRY Version 2\n" + "\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n' + "\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n') + (self.reg.parent / ".droiddeck-redists").write_text(marker + "\n") + result = self.ubisoft() + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertIn("Ubisoft Connect markers out", result.stdout) + if __name__ == "__main__": unittest.main()