Changes related to ATOM-15021, this allows maya on py2.7 to work with .o3de\boostrap changes

2021-06-09 14:27:59 -05:00
parent dda6fee227
commit d5916630b8
3 changed files with 23 additions and 4 deletions
@@ -226,7 +226,18 @@ TAG_DEFAULT_PY = str('Launch_pyBASE.bat')
 FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json')

 # new o3de related paths
-PATH_USER_O3DE = str('{home}\\{o3de}').format(home=expanduser("~"),
+# os.path.expanduser("~") returns different values in py2.7 vs 3
+PATH_USER_HOME = expanduser("~")
+_LOGGER.debug('user home: {}'.format(PATH_USER_HOME))
+
+# special case, make sure didn't return <user>\documents
+parts = os.path.split(PATH_USER_HOME)
+
+if str(parts[1].lower()) == 'documents':
+    PATH_USER_HOME = parts[0]
+    _LOGGER.debug('user home CORRECTED: {}'.format(PATH_USER_HOME))
+
+PATH_USER_O3DE = str('{home}\\{o3de}').format(home=PATH_USER_HOME,
                                              o3de=TAG_O3DE_FOLDER)
 PATH_USER_O3DE_REGISTRY = str('{0}\\Registry').format(PATH_USER_O3DE)
 PATH_USER_O3DE_BOOTSTRAP = str('{reg}\\{file}').format(reg=PATH_USER_O3DE_REGISTRY,