mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
creatensis.pl: don't require admin rights to create the uninstaller
This commit is contained in:
parent
f38c032046
commit
ef89a624a1
@ -13,6 +13,12 @@
|
||||
# Download OSGeo4W packages
|
||||
#
|
||||
|
||||
BEGIN {
|
||||
# ignore requireAdministrator execution level while producing the
|
||||
# uninstaller
|
||||
$ENV{"__COMPAT_LAYER"} = 'RUNASINVOKER';
|
||||
}
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Getopt::Long;
|
||||
@ -448,16 +454,18 @@ my $installerbase = "$packagename-OSGeo4W-$version-$binary-Setup$archpostfix";
|
||||
|
||||
my $run;
|
||||
my $instdest;
|
||||
unless($^O =~ /win/i) {
|
||||
|
||||
if($^O eq "cygwin") {
|
||||
$run = "cygstart ";
|
||||
$instdest = `cygpath -w \$PWD`;
|
||||
} else {
|
||||
$run = "wine ";
|
||||
$instdest = `winepath -w \$PWD`;
|
||||
$instdest =~ s/\s+$//;
|
||||
$instdest =~ s/\\/\\\\/g;
|
||||
} else {
|
||||
$run = "";
|
||||
$instdest = ".";
|
||||
}
|
||||
|
||||
$instdest =~ s/\s+$//;
|
||||
$instdest =~ s/\\/\\\\/g;
|
||||
|
||||
|
||||
my $args = "";
|
||||
$args .= " -V$verbose";
|
||||
@ -498,7 +506,9 @@ die "running makensis failed [$cmd]" if $?;
|
||||
die "makeuinst.exe not created" unless -f "makeuinst.exe";
|
||||
|
||||
unlink "uninstall.exe";
|
||||
chmod 0755, "makeuinst.exe";
|
||||
system "${run}makeuinst.exe";
|
||||
sleep 5;
|
||||
die "uninstall.exe not created" unless -f "uninstall.exe";
|
||||
unlink "makeuinst.exe";
|
||||
|
||||
|
@ -7101,6 +7101,7 @@ tyrranies:tyrannies
|
||||
tyrrany:tyranny
|
||||
ubiquitious:ubiquitous
|
||||
ublisher:publisher
|
||||
updat:update
|
||||
udpate:update
|
||||
udpated:updated
|
||||
udpates:updates
|
||||
|
Loading…
x
Reference in New Issue
Block a user