Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
fix(sync-upstream): accept only a dotted NOTPROTON_VERSION from upstream
raymondchins5520c4cffef5
diff --git a/scripts/sync-upstream.sh b/scripts/sync-upstream.shindex 93b930f..87e85ba 100755--- a/scripts/sync-upstream.sh+++ b/scripts/sync-upstream.sh@@ -72,6 +72,12 @@ for entry in $pending; doexit 1fitheirs=$(git show "$ref:dylib/version.h" | version_of)+ # It goes into a sed replacement below, so only a plain dotted version gets that far.+ if ! printf '%s\n' "$theirs" | grep -Eqx '[0-9.]+'; then+ git merge --abort+ echo "==> $ref has NOTPROTON_VERSION \"$theirs\", not a dotted version; nothing was merged" >&2+ exit 1+ figit checkout -q --ours dylib/version.hsed -i '' "s/^#define NOTPROTON_VERSION \".*\"/#define NOTPROTON_VERSION \"$theirs\"/" dylib/version.hgit add dylib/version.h