sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

creatensis.pl: don't require admin rights to create the uninstaller

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-08-20 13:48:39 +02:00
parent f38c032046
commit ef89a624a1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ms-windows/osgeo4w/creatensis.pl
View File

@ -13,6 +13,12 @@
# Download OSGeo4W packages # Download OSGeo4W packages
# #
BEGIN {
# ignore requireAdministrator execution level while producing the
# uninstaller
$ENV{"__COMPAT_LAYER"} = 'RUNASINVOKER';
}
use strict; use strict;
use warnings; use warnings;
use Getopt::Long; use Getopt::Long;
@ -448,16 +454,18 @@ my $installerbase = "$packagename-OSGeo4W-$version-$binary-Setup$archpostfix";
my $run; my $run;
my $instdest; my $instdest;
unless($^O =~ /win/i) {
if($^O eq "cygwin") {
$run = "cygstart ";
$instdest = `cygpath -w \$PWD`;
} else {
$run = "wine "; $run = "wine ";
$instdest = `winepath -w \$PWD`; $instdest = `winepath -w \$PWD`;
$instdest =~ s/\s+$//;
$instdest =~ s/\\/\\\\/g;
} else {
$run = "";
$instdest = ".";
} }
$instdest =~ s/\s+$//;
$instdest =~ s/\\/\\\\/g;
my $args = ""; my $args = "";
$args .= " -V$verbose"; $args .= " -V$verbose";
@ -498,7 +506,9 @@ die "running makensis failed [$cmd]" if $?;
die "makeuinst.exe not created" unless -f "makeuinst.exe"; die "makeuinst.exe not created" unless -f "makeuinst.exe";
unlink "uninstall.exe"; unlink "uninstall.exe";
chmod 0755, "makeuinst.exe";
system "${run}makeuinst.exe"; system "${run}makeuinst.exe";
sleep 5;
die "uninstall.exe not created" unless -f "uninstall.exe"; die "uninstall.exe not created" unless -f "uninstall.exe";
unlink "makeuinst.exe"; unlink "makeuinst.exe";

1
scripts/spell_check/spelling.dat
View File

@ -7101,6 +7101,7 @@ tyrranies:tyrannies
tyrrany:tyranny tyrrany:tyranny
ubiquitious:ubiquitous ubiquitious:ubiquitous
ublisher:publisher ublisher:publisher
updat:update
udpate:update udpate:update
udpated:updated udpated:updated
udpates:updates udpates:updates