From d7318c9306a492eee6d5d66b75f0434f896e69db Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 10 Mar 2013 17:22:15 +0100 Subject: [PATCH] correct small problem in temlates --- sample/32bit/installer/license/CLIENT_DATA/delsub32.ins | 4 ++-- sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins | 4 ++-- sample/32bit/msi/license/CLIENT_DATA/delsub32.ins | 2 +- sample/32bit/msi/nolicense/CLIENT_DATA/delsub32.ins | 2 +- sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins | 4 ++-- sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins | 4 ++-- sample/32bit64/msi/license/CLIENT_DATA/delsub3264.ins | 4 ++-- sample/32bit64/msi/nolicense/CLIENT_DATA/delsub3264.ins | 4 ++-- sample/32bit64/msi/nolicense/CLIENT_DATA/setup3264.ins | 2 -- sample/64bit/installer/license/CLIENT_DATA/delsub64.ins | 2 +- sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins | 2 +- sample/64bit/msi/license/CLIENT_DATA/delsub64.ins | 2 +- sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins index 8ae44e4..64d26bf 100644 --- a/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/license/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgramOld$ = $InstallDir$ + $UninstallProg$ +Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" @@ -65,7 +65,7 @@ LinkFolder_uninstall [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins b/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins index 8ae44e4..64d26bf 100644 --- a/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgramOld$ = $InstallDir$ + $UninstallProg$ +Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" @@ -65,7 +65,7 @@ LinkFolder_uninstall [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit/msi/license/CLIENT_DATA/delsub32.ins b/sample/32bit/msi/license/CLIENT_DATA/delsub32.ins index 6bc6521..6f1e92a 100644 --- a/sample/32bit/msi/license/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/msi/license/CLIENT_DATA/delsub32.ins @@ -45,7 +45,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit/msi/nolicense/CLIENT_DATA/delsub32.ins b/sample/32bit/msi/nolicense/CLIENT_DATA/delsub32.ins index 6bc6521..6f1e92a 100644 --- a/sample/32bit/msi/nolicense/CLIENT_DATA/delsub32.ins +++ b/sample/32bit/msi/nolicense/CLIENT_DATA/delsub32.ins @@ -45,7 +45,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins index 1411c6c..f742775 100644 --- a/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/license/CLIENT_DATA/delsub3264.ins @@ -96,7 +96,7 @@ LinkFolder_uninstall [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" [Winbatch_uninstall_old_64] ; Choose one of the following examples as basis for program uninstall @@ -129,7 +129,7 @@ msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins index 1411c6c..f742775 100644 --- a/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/installer/nolicense/CLIENT_DATA/delsub3264.ins @@ -96,7 +96,7 @@ LinkFolder_uninstall [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" [Winbatch_uninstall_old_64] ; Choose one of the following examples as basis for program uninstall @@ -129,7 +129,7 @@ msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit64/msi/license/CLIENT_DATA/delsub3264.ins b/sample/32bit64/msi/license/CLIENT_DATA/delsub3264.ins index 21e86b6..c0fdcce 100644 --- a/sample/32bit64/msi/license/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/msi/license/CLIENT_DATA/delsub3264.ins @@ -76,7 +76,7 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" [Winbatch_uninstall_msi_old_64] msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress @@ -87,7 +87,7 @@ msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit64/msi/nolicense/CLIENT_DATA/delsub3264.ins b/sample/32bit64/msi/nolicense/CLIENT_DATA/delsub3264.ins index 21e86b6..c0fdcce 100644 --- a/sample/32bit64/msi/nolicense/CLIENT_DATA/delsub3264.ins +++ b/sample/32bit64/msi/nolicense/CLIENT_DATA/delsub3264.ins @@ -76,7 +76,7 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" [Winbatch_uninstall_msi_old_64] msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress @@ -87,7 +87,7 @@ msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/32bit64/msi/nolicense/CLIENT_DATA/setup3264.ins b/sample/32bit64/msi/nolicense/CLIENT_DATA/setup3264.ins index f9f4d25..42e565d 100644 --- a/sample/32bit64/msi/nolicense/CLIENT_DATA/setup3264.ins +++ b/sample/32bit64/msi/nolicense/CLIENT_DATA/setup3264.ins @@ -48,8 +48,6 @@ Set $MinimumSpace$ = "1 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\" Set $InstallDir64$ = "%ProgramFiles64Dir%\" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" diff --git a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins index fa0dc29..3169807 100644 --- a/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/license/CLIENT_DATA/delsub64.ins @@ -64,7 +64,7 @@ LinkFolder_uninstall [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins index fa0dc29..3169807 100644 --- a/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/installer/nolicense/CLIENT_DATA/delsub64.ins @@ -64,7 +64,7 @@ LinkFolder_uninstall [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins b/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins index 43e5baa..c7db77f 100644 --- a/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/msi/license/CLIENT_DATA/delsub64.ins @@ -45,7 +45,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins b/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins index 43e5baa..c7db77f 100644 --- a/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins +++ b/sample/64bit/msi/nolicense/CLIENT_DATA/delsub64.ins @@ -45,7 +45,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] ; Example for recursively deleting the installation directory: ; -; del -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: