really uninstall

This commit is contained in:
Mario Fetka 2012-01-23 19:58:10 +01:00
parent 98803a1c7d
commit 83751f7102
2 changed files with 7 additions and 5 deletions

View File

@ -5,10 +5,10 @@
Set $MsiId32$ = '{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}'
Set $UninstallProgram32$ = $InstallDir32$ + "\unins000.exe"
Set $UninstallProgram32$ = $InstallDir32$ + "UVERSION\uninstall.exe"
Set $MsiId64$ = '{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}'
Set $UninstallProgram32$ = $InstallDir64$ + "\unins000.exe"
Set $UninstallProgram32$ = $InstallDir64$ + "UVERSION\uninstall.exe"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
Message "Uninstalling " + $ProductId$ + " 32 Bit..."
@ -59,7 +59,7 @@ LinkFolder_uninstall
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
"$UninstallProgram32$" /VERYSILENT
"$UninstallProgram32$" /S
[Winbatch_uninstall_msi_32]
@ -74,7 +74,7 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
"$UninstallProgram64$" /VERYSILENT
"$UninstallProgram64$" /S
[Winbatch_uninstall_msi_64]

View File

@ -1,7 +1,8 @@
#!/bin/sh
PN="immunet"
VERSION="3.0.5.7688"
RELEASE="2"
UVERSION="3.0.5"
RELEASE="3"
PRIORITY="0"
ADVICE=""
TYPE="testing"
@ -96,6 +97,7 @@ unix2dos $OUT/$PN/CLIENT_DATA/*
sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!$RELEASE!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" -i $OUT/$PN/OPSI/control
sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.ins
sed -e "s!UVERSION!$UVERSION!g" -i $OUT/$PN/CLIENT_DATA/delsub.ins
if test -d ".git"; then
git log --date-order --date=short | \