Skip to content

Commit

Permalink
osgeo4w: support GRASS 7.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 25, 2019
1 parent 6551c2a commit aa30730
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/package-nightly.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ set CMAKE_OPT=^

:devenv
set GRASS7=
if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
if "%GRASS7%"=="" (echo GRASS7 not found & goto error)

for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS7_PATH=%%a
Expand Down
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ set CMAKE_OPT=^

:devenv
set GRASS7=
if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
if "%GRASS7%"=="" (echo GRASS7 not found & goto error)

for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS7_PATH=%%a
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/Grass7Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def installedVersion(run=False):
if Grass7Utils.grassPath() is None:
return None

for command in ["grass74", "grass72", "grass71", "grass70", "grass"]:
for command in ["grass76", "grass74", "grass72", "grass71", "grass70", "grass"]:
proc = subprocess.Popen(
["{} -v".format(command)],
shell=True,
Expand Down

0 comments on commit aa30730

Please sign in to comment.