fix namespace collision for multiple proton installs

Steven Noonan · Steven Noonan · commit 7bfeb7f94d06 · 2018-10-13T00:27:52.000-07:00
Signed-off-by: Steven Noonan &lt;steven@valvesoftware.com&gt;
diff --git a/build/makefile_base.mak b/build/makefile_base.mak
@@ -263,7 +263,7 @@ $(DIST_VERSION): | $(DST_DIR)
 	cp $(DIST_VERSION) $(DST_BASE)/
 
 $(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) $(MAKEFILE_DEP) | $(DST_DIR)
-	sed -r 's|//##DISPLAY_NAME##|"display_name" "'$(BUILD_NAME)'"|' $< > $@
+	sed -r 's|##BUILD_NAME##|$(BUILD_NAME)|' $< > $@
 
 $(DIST_GECKO_DIR):
 	mkdir -p $@
diff --git a/compatibilitytool.vdf.template b/compatibilitytool.vdf.template
@@ -2,7 +2,7 @@
 {
   "compat_tools"
   {
-    "proton-localbuild" // Internal name of this tool
+    "##BUILD_NAME##" // Internal name of this tool
     {
       // Can register this tool with Steam in two ways:
       //
@@ -14,9 +14,7 @@
       "install_path" "."
 
       // For this template, we're going to substitute the display_name key in here, e.g.:
-      // "display_name" "Proton - local build 3/2"
-
-      //##DISPLAY_NAME##
+      "display_name" "##BUILD_NAME##"
 
       "from_oslist"  "windows"
       "to_oslist"    "linux"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"compat_tools"`
`4`	`4`	`{`
`5`		`- "proton-localbuild" // Internal name of this tool`
	`5`	`+ "##BUILD_NAME##" // Internal name of this tool`
`6`	`6`	`{`
`7`	`7`	`// Can register this tool with Steam in two ways:`
`8`	`8`	`//`
`@@ -14,9 +14,7 @@`
`14`	`14`	`"install_path" "."`
`15`	`15`
`16`	`16`	`// For this template, we're going to substitute the display_name key in here, e.g.:`
`17`		`- // "display_name" "Proton - local build 3/2"`
`18`		`-`
`19`		`- //##DISPLAY_NAME##`
	`17`	`+ "display_name" "##BUILD_NAME##"`
`20`	`18`
`21`	`19`	`"from_oslist" "windows"`
`22`	`20`	`"to_oslist" "linux"`