Skip to content

Commit

Permalink
g.extension: remove build_platform (only 64bit provided on MS Windows) (
Browse files Browse the repository at this point in the history
  • Loading branch information
landam committed Jan 17, 2022
1 parent 7cef802 commit 33d95f7
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions scripts/g.extension/g.extension.py
Expand Up @@ -1422,24 +1422,16 @@ def install_module_xml(mlist):
def install_extension_win(name):
"""Install extension on MS Windows"""
grass.message(
_("Downloading precompiled GRASS Addons <%s>...") % options["extension"]
_("Downloading precompiled GRASS Addons <{}>...").format(options["extension"])
)

# build base URL
if build_platform == "x86_64":
platform = build_platform
else:
platform = "x86"
base_url = (
"http://wingrass.fsv.cvut.cz/"
"grass%(major)s%(minor)s/%(platform)s/addons/"
"grass-%(major)s.%(minor)s.%(patch)s"
% {
"platform": platform,
"major": version[0],
"minor": version[1],
"patch": version[2],
}
"grass{major}{minor}/addons/"
"grass-{major}.{minor}.{patch}".format(
major=version[0], minor=version[1], patch=version[2]
)
)

# resolve ZIP URL
Expand Down Expand Up @@ -2647,6 +2639,4 @@ def main():
grass_version = grass.version()
version = grass_version["version"].split(".")

build_platform = grass_version["build_platform"].split("-", 1)[0]

sys.exit(main())

0 comments on commit 33d95f7

Please sign in to comment.