Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
osgeo4w: fix grass plugin postinstall
  • Loading branch information
jef-n committed Feb 25, 2018
1 parent af4cbe2 commit 001c80b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions ms-windows/osgeo4w/postinstall-grass.bat
Expand Up @@ -2,12 +2,12 @@ textreplace -std -t bin\@package@-grass@grassmajor@.bat

if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$

copy bin\@package@-bin.exe bin\@package@-bin-grass@grassmajor@.exe
copy bin\@package@-bin.vars bin\@package@-bin-grass@grassmajor@.vars
copy bin\@package@-bin.exe bin\@package@-bin-g@grassversion@.exe
copy bin\@package@-bin.vars bin\@package@-bin-g@grassversion@.vars
call "%OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" --postinstall

if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"

if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\@package@-bin-grass@grassmajor@.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS @grassversion@"
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\@package@-bin-grass@grassmajor@.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@ with GRASS @grassversion@"
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\@package@-bin-g@grassversion@.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS @grassversion@"
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\@package@-bin-g@grassversion@.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@ with GRASS @grassversion@"
6 changes: 3 additions & 3 deletions ms-windows/osgeo4w/preremove-grass.bat
Expand Up @@ -5,6 +5,6 @@ del "%OSGEO4W_DESKTOP%\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
del "%OSGEO4W_DESKTOP%\QGIS Browser @version@ with GRASS @grassversion@.lnk"
rmdir "%OSGEO4W_DESKTOP%"
del "%OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat"
del "%OSGEO4W_ROOT%\bin\@package@-bin-grass@grassmajor@.exe"
del "%OSGEO4W_ROOT%\bin\@package@-bin-grass@grassmajor@.vars"
del "%OSGEO4W_ROOT%\bin\@package@-bin-grass@grassmajor@.env"
del "%OSGEO4W_ROOT%\bin\@package@-bin-g@grassversion@.exe"
del "%OSGEO4W_ROOT%\bin\@package@-bin-g@grassversion@.vars"
del "%OSGEO4W_ROOT%\bin\@package@-bin-g@grassversion@.env"

0 comments on commit 001c80b

Please sign in to comment.