Merge pull request #2095 from tong/sdk-path-normalize

Normalize sdk path
This commit is contained in:
Lubos Lenco 2021-01-26 18:27:39 +01:00 committed by GitHub
commit 74b99411df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -156,11 +156,11 @@ def get_sdk_path():
addon_prefs = get_arm_preferences()
p = bundled_sdk_path()
if use_local_sdk:
return get_fp() + '/armsdk/'
return os.path.normpath(get_fp() + '/armsdk/')
elif os.path.exists(p) and addon_prefs.sdk_bundled:
return p
return os.path.normpath(p)
else:
return addon_prefs.sdk_path
return os.path.normpath(addon_prefs.sdk_path)
def get_last_commit():
p = get_sdk_path() + 'armory/.git/refs/heads/master'