From ef24e65ccf6fb52ef853559c093bb8294160d620 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 25 Feb 2018 11:35:58 +0100 Subject: [PATCH] osgeo4w: fix grass plugin postinstall (cherry picked from commit 001c80b0c3478f9d1fc026965c439aa843f0a66d) --- ms-windows/osgeo4w/postinstall-grass.bat | 8 ++++---- ms-windows/osgeo4w/preremove-grass.bat | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ms-windows/osgeo4w/postinstall-grass.bat b/ms-windows/osgeo4w/postinstall-grass.bat index c0535a13329..a4e6b280061 100644 --- a/ms-windows/osgeo4w/postinstall-grass.bat +++ b/ms-windows/osgeo4w/postinstall-grass.bat @@ -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@" diff --git a/ms-windows/osgeo4w/preremove-grass.bat b/ms-windows/osgeo4w/preremove-grass.bat index 42ae9d58633..1694aa97e5d 100644 --- a/ms-windows/osgeo4w/preremove-grass.bat +++ b/ms-windows/osgeo4w/preremove-grass.bat @@ -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"