Skip to content

Commit c2ff2d7

Browse files
jef-njef-n
committedMar 13, 2016
osgeo4w: support for OSGEO4W_DESKTOP and fix deinstallation
·
ltr-3_40archive/master_2
1 parent 23cd2fc commit c2ff2d7

9 files changed

+87
-56
lines changed
 

‎ms-windows/QGIS-Installer.nsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ Section "QGIS" SecQGIS
356356
GetFullPathName /SHORT $0 $INSTALL_DIR
357357
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_ROOT", "$0").r0'
358358
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_STARTMENU", "$SMPROGRAMS\${QGIS_BASE}").r0'
359+
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_DESKTOP", "$DESKTOP\${QGIS_BASE}").r0'
359360
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_MENU_LINKS", "1").r0'
360361
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_DESKTOP_LINKS", "1").r0'
361362

@@ -485,11 +486,12 @@ Section "Uninstall"
485486
GetFullPathName /SHORT $0 $INSTDIR
486487
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_ROOT", "$0").r0'
487488
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_STARTMENU", "$SMPROGRAMS\${QGIS_BASE}").r0'
489+
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_DESKTOP", "$DESKTOP\${QGIS_BASE}").r0'
488490
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_MENU_LINKS", "1").r0'
489491
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_DESKTOP_LINKS", "1").r0'
490492

491493
ReadEnvStr $0 COMSPEC
492-
nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\preremove.bat"'
494+
nsExec::ExecToLog '"$0" /c "$INSTDIR\preremove.bat"'
493495

494496
Delete "$INSTDIR\Uninstall-QGIS.exe"
495497
Delete "$INSTDIR\*.bat.done"

‎ms-windows/osgeo4w/creatensis.pl

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -271,55 +271,69 @@ sub getDeps {
271271

272272
open F, ">../Installer-Files/postinstall.bat";
273273

274+
my $r = ">>postinstall.log 2>&1\r\n";
275+
274276
print F "\@echo off\r\n";
275-
print F "del postinstall.log>>postinstall.log\r\n";
276-
print F "echo OSGEO4W_ROOT=%OSGEO4W_ROOT%>>postinstall.log 2>&1\r\n";
277-
print F "echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU%>>postinstall.log 2>&1\r\n";
278-
print F "set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT:\\=/%\r\n";
279-
print F "if \"%OSGEO4W_ROOT_MSYS:~1,1%\"==\":\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS:~0,1%/%OSGEO4W_ROOT_MSYS:~3%\r\n";
280-
print F "echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS%>>postinstall.log 2>&1\r\n";
281-
print F "PATH %OSGEO4W_ROOT%\\bin;%PATH%>>postinstall.log 2>&1\r\n";
282-
print F "cd %OSGEO4W_ROOT%>>postinstall.log 2>&1\r\n";
277+
print F "del postinstall.log\r\n";
278+
print F "set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT:\\=/%$r";
279+
print F "if \"%OSGEO4W_ROOT_MSYS:~1,1%\"==\":\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS:~0,1%/%OSGEO4W_ROOT_MSYS:~3%$r";
280+
281+
print F "del preremove-conf.bat$r";
282+
my $c = ">>preremove-conf.bat\r\n";
283+
print F "echo set OSGEO4W_ROOT=%OSGEO4W_ROOT%$c";
284+
print F "echo set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS%$c";
285+
print F "echo set OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU%$c";
286+
print F "echo set OSGEO4W_DESKTOP=%OSGEO4W_DESKTOP%$c";
287+
288+
print F "echo OSGEO4W_ROOT=%OSGEO4W_ROOT%$r";
289+
print F "echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS%$r";
290+
print F "echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU%$r";
291+
print F "echo OSGEO4W_DESKTOP=%OSGEO4W_DESKTOP%$r";
292+
print F "PATH %OSGEO4W_ROOT%\\bin;%PATH%$r";
293+
print F "cd %OSGEO4W_ROOT%$r";
283294

284295
chdir $unpacked;
285296
for my $p (<etc/postinstall/*.bat>) {
286297
$p =~ s/\//\\/g;
287298
my($dir,$file) = $p =~ /^(.+)\\([^\\]+)$/;
288299

289-
print F "echo Running postinstall $file...\r\n";
290-
print F "%COMSPEC% /c $p>>postinstall.log 2>&1\r\n";
291-
print F "ren $p $file.done>>postinstall.log 2>&1\r\n";
300+
print F "echo Running postinstall $file...$r";
301+
print F "%COMSPEC% /c $p$r";
302+
print F "ren $p $file.done$r";
292303
}
293304
chdir "..";
294305

295-
print F "ren postinstall.bat postinstall.bat.done\r\n";
306+
print F "ren postinstall.bat postinstall.bat.done$r";
296307

297308
close F;
298309

299310
open F, ">../Installer-Files/preremove.bat";
300311

312+
$r = ">>%TEMP%\\$packagename-OSGeo4W-$version-$binary-preremove.log 2>&1\r\n";
313+
301314
print F "\@echo off\r\n";
302-
print F "del preremove.log>>preremove.log\r\n";
303-
print F "echo OSGEO4W_ROOT=%OSGEO4W_ROOT%>>preremove.log 2>&1\r\n";
304-
print F "echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU%>>preremove.log 2>&1\r\n";
305-
print F "set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT:\\=/%\r\n";
306-
print F "if \"%OSGEO4W_ROOT_MSYS:~1,1%\"==\":\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS:~0,1%/%OSGEO4W_ROOT_MSYS:~3%\r\n";
307-
print F "echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS%>>preremove.log 2>&1\r\n";
308-
print F "PATH %OSGEO4W_ROOT%\\bin;%PATH%>>preremove.log 2>&1\r\n";
309-
print F "cd %OSGEO4W_ROOT%>>preremove.log 2>&1\r\n";
315+
print F "call \"%~dp0\\preremove-conf.bat\"$r";
316+
print F "echo OSGEO4W_ROOT=%OSGEO4W_ROOT%$r";
317+
print F "echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU%$r";
318+
print F "echo OSGEO4W_DESKTOP=%OSGEO4W_DESKTOP%$r";
319+
print F "set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT:\\=/%$r";
320+
print F "if \"%OSGEO4W_ROOT_MSYS:~1,1%\"==\":\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS:~0,1%/%OSGEO4W_ROOT_MSYS:~3%$r";
321+
print F "echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS%$r";
322+
print F "PATH %OSGEO4W_ROOT%\\bin;%PATH%$r";
323+
print F "cd %OSGEO4W_ROOT%$r";
310324

311325
chdir $unpacked;
312326
for my $p (<etc/preremove/*.bat>) {
313327
$p =~ s/\//\\/g;
314328
my($dir,$file) = $p =~ /^(.+)\\([^\\]+)$/;
315329

316-
print F "echo Running preremove $file...\r\n";
317-
print F "%COMSPEC% /c $p>>preremove.log 2>&1\r\n";
318-
print F "ren $p $file.done>>preremove.log 2>&1\r\n";
330+
print F "echo Running preremove $file...$r";
331+
print F "%COMSPEC% /c $p$r";
332+
print F "ren $p $file.done$r";
319333
}
320334
chdir "..";
321335

322-
print F "ren preremove.bat preremove.bat.done\r\n";
336+
print F "ren preremove.bat preremove.bat.done$r";
323337

324338
close F;
325339

‎ms-windows/osgeo4w/postinstall-desktop.bat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ textreplace -std -t bin\python-@package@.bat
55

66
REM get short path without blanks
77
for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi
8+
if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$
89

910
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
1011
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@" "exec hide %O4W_ROOT%\bin\@package@.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1112
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@" "exec hide %O4W_ROOT%\bin\@package@-browser.bat" "%O4W_ROOT%\apps\@package@\icons\browser.ico"
1213
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1314

14-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@" "exec hide %O4W_ROOT%\bin\@package@.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
15-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@" "exec hide %O4W_ROOT%\bin\@package@-browser.bat" "%O4W_ROOT%\apps\@package@\icons\browser.ico"
16-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets" "exec hide %O4W_ROOT%\bin\@package@-designer.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
15+
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
16+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@" "exec hide %O4W_ROOT%\bin\@package@.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
17+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser @version@" "exec hide %O4W_ROOT%\bin\@package@-browser.bat" "%O4W_ROOT%\apps\@package@\icons\browser.ico"
18+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "Qt Designer with QGIS @version@ custom widgets" "exec hide %O4W_ROOT%\bin\@package@-designer.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
1719

1820
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%
1921
textreplace -std -t "%O4W_ROOT%\apps\@package@\bin\qgis.reg"

‎ms-windows/osgeo4w/postinstall-dev.bat

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
textreplace -std -t bin\@package@-designer.bat
22
textreplace -std -t bin\python-@package@.bat
33

4+
if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$
5+
6+
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
7+
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
8+
49
for %%g in (@grassversions@) do (
510
textreplace -std -t bin\@package@-g%%g.bat
611
textreplace -std -t bin\@package@-browser-g%%g.bat
712

8-
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
913
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1014
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
1115

12-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
13-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
16+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
17+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser @version@ with GRASS %%g (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
1418
)
1519

1620
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
17-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
21+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "Qt Designer with QGIS @version@ custom widgets (Nightly)" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
1822

1923
set O4W_ROOT=%OSGEO4W_ROOT%
2024
set OSGEO4W_ROOT=%OSGEO4W_ROOT:\=\\%

‎ms-windows/osgeo4w/postinstall-grass.bat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
textreplace -std -t bin\@package@-grass@grassmajor@.bat
22
textreplace -std -t bin\@package@-browser-grass@grassmajor@.bat
33

4+
if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$
5+
46
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
57
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
68
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
79

8-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Desktop @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
9-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "~$folder.desktop$" "QGIS Browser @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"
10+
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
11+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\QGIS.ico"
12+
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%OSGEO4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser @version@ with GRASS @grassversion@" "exec hide %OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat" "%OSGEO4W_ROOT%\apps\@package@\icons\browser.ico"

‎ms-windows/osgeo4w/preremove-desktop.bat

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@.lnk"
22
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@.lnk"
33
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets.lnk"
4-
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@.lnk"
5-
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@.lnk"
6-
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets.lnk"
7-
del "%OSGEO4W_ROOT%"\bin\@package@.bat
8-
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat
9-
del "%OSGEO4W_ROOT%"\bin\@package@-designer.bat
10-
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
11-
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg
4+
rmdir "%OSGEO4W_STARTMENU%"
5+
del "%OSGEO4W_DESKTOP%\QGIS Desktop @version@.lnk"
6+
del "%OSGEO4W_DESKTOP%\QGIS Browser @version@.lnk"
7+
del "%OSGEO4W_DESKTOP%\Qt Designer with QGIS @version@ custom widgets.lnk"
8+
rmdir "%OSGEO4W_DESKTOP%"
9+
del "%OSGEO4W_ROOT%\bin\@package@.bat"
10+
del "%OSGEO4W_ROOT%\bin\@package@-browser.bat"
11+
del "%OSGEO4W_ROOT%\bin\@package@-designer.bat"
12+
del "%OSGEO4W_ROOT%\apps\@package@\python\qgis\qgisconfig.py"
13+
del "%OSGEO4W_ROOT%\apps\@package@\bin\qgis.reg"

‎ms-windows/osgeo4w/preremove-dev.bat

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
for %%g in (@grassversions@) do (
22
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk"
33
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ with GRASS %%g (Nightly).lnk"
4-
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk"
5-
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ with GRASS %%g (Nightly).lnk"
6-
del "%OSGEO4W_ROOT%"\bin\@package@-g%%g.bat
7-
del "%OSGEO4W_ROOT%"\bin\@package@-browser-g%%g.bat
4+
del "%OSGEO4W_DESKTOP%\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk"
5+
del "%OSGEO4W_DESKTOP%\QGIS Browser @version@ with GRASS %%g (Nightly).lnk"
6+
del "%OSGEO4W_ROOT%\bin\@package@-g%%g.bat"
7+
del "%OSGEO4W_ROOT%\bin\@package@-browser-g%%g.bat"
88
)
99

1010
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
11-
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
11+
rmdir "%OSGEO4W_STARTMENU%"
12+
del "%OSGEO4W_DESKTOP%\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk"
13+
rmdir "%OSGEO4W_DESKTOP%"
1214

13-
del "%OSGEO4W_ROOT%"\bin\@package@-designer.bat
14-
del "%OSGEO4W_ROOT%"\bin\python-@package@.bat
15-
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py
16-
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg
15+
del "%OSGEO4W_ROOT%\bin\@package@-designer.bat"
16+
del "%OSGEO4W_ROOT%\bin\python-@package@.bat"
17+
del "%OSGEO4W_ROOT%\apps\@package@\python\qgis\qgisconfig.py"
18+
del "%OSGEO4W_ROOT%\apps\@package@\bin\qgis.reg"

‎ms-windows/osgeo4w/preremove-grass.bat

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
22
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ with GRASS @grassversion@.lnk"
3-
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
4-
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ with GRASS @grassversion@.lnk"
5-
del "%OSGEO4W_ROOT%"\bin\@package@-grass@grassmajor@.bat
6-
del "%OSGEO4W_ROOT%"\bin\@package@-browser-grass@grassmajor@.bat
3+
rmdir "%OSGEO4W_STARTMENU%"
4+
del "%OSGEO4W_DESKTOP%\QGIS Desktop @version@ with GRASS @grassversion@.lnk"
5+
del "%OSGEO4W_DESKTOP%\QGIS Browser @version@ with GRASS @grassversion@.lnk"
6+
rmdir "%OSGEO4W_DESKTOP%"
7+
del "%OSGEO4W_ROOT%\bin\@package@-grass@grassmajor@.bat"
8+
del "%OSGEO4W_ROOT%\bin\@package@-browser-grass@grassmajor@.bat"

‎ms-windows/osgeo4w/preremove-server.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
del "%OSGEO4W_ROOT%"\httpd.d\httpd_@package@.conf
1+
del "%OSGEO4W_ROOT%\httpd.d\httpd_@package@.conf"

0 commit comments

Comments
 (0)
Please sign in to comment.