Merge pull request swiftlang#35226 from dduan/dd/mobile-home

CodaFi · web-flow · commit 750d559dd9eb · 2021-01-05T11:52:45.000-08:00
[build] Make home directory portable
diff --git a/utils/build-script b/utils/build-script
@@ -1167,7 +1167,7 @@ def main_preset():
                 "build-presets.ini")
         ]
 
-        user_presets_file = os.path.join(os.getenv("HOME", "/"),
+        user_presets_file = os.path.join(os.path.expanduser("~"),
                                          '.swift-build-presets')
         if os.path.isfile(user_presets_file):
             args.preset_file_names.append(user_presets_file)

Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ def main_preset():`
`1167`	`1167`	`"build-presets.ini")`
`1168`	`1168`	`]`
`1169`	`1169`
`1170`		`- user_presets_file = os.path.join(os.getenv("HOME", "/"),`
	`1170`	`+ user_presets_file = os.path.join(os.path.expanduser("~"),`
`1171`	`1171`	`'.swift-build-presets')`
`1172`	`1172`	`if os.path.isfile(user_presets_file):`
`1173`	`1173`	`args.preset_file_names.append(user_presets_file)`