go-opsi/microsoft.sysinternalssuite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to new buildsystem and bump

Browse Source
This commit is contained in:
Mario Fetka
2013-02-24 20:50:44 +01:00
parent 02dd959db4
commit 1102626ece
16 changed files with 177 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
CLIENT_DATA/AcceptEULA.inf → CLIENT_DATA/X86/AcceptEULA.inf
View File

10
CLIENT_DATA/Install_SysinternalsSuite.inf → CLIENT_DATA/X86/Install_SysinternalsSuite.inf
View File

@@ -30,7 +30,7 @@
; //
; // Purpose: Installs the Sysinternals Suite
; //
; // Updated: May 18, 2011
; // Updated: February 5, 2013
; //
; // INF File Generation Script version: 1.0.0
; //
@@ -108,6 +108,7 @@ DMON.SYS
du.exe
efsdump.exe
Eula.txt
FindLinks.exe
handle.exe
hex2dec.exe
junction.exe
@@ -128,7 +129,6 @@ PORTMON.HLP
procdump.exe
procexp.chm
procexp.exe
ProcFeatures.exe
procmon.chm
Procmon.exe
PsExec.exe
@@ -136,10 +136,11 @@ psfile.exe
PsGetsid.exe
PsInfo.exe
pskill.exe
PsList.exe
pslist.exe
PsLoggedon.exe
psloglist.exe
pspasswd.exe
psping.exe
PsService.exe
psshutdown.exe
pssuspend.exe
@@ -161,6 +162,7 @@ sync.exe
Tcpvcon.exe
tcpview.chm
Tcpview.exe
TCPVIEW.HLP
Vmmap.chm
vmmap.exe
Volumeid.exe
@@ -265,7 +267,7 @@ setup.ini, group2,,"""%PsToolsDesc%""
[Strings]
DisplayName = "Sysinternals Suite (Uninstall only)"
DisplayVersion = "May 18, 2011"
DisplayVersion = "February 5, 2013"
SysinternalsSuiteGroup = "Sysinternals Suite"
SysinternalsSuiteCmdPrompt = "Sysinternals Suite Command Prompt"

24
CLIENT_DATA/delsub32.ins
View File

@@ -4,11 +4,19 @@
; credits: http://www.opsi.org/credits/
Set $MsiId$ = '{BB05D173-9681-4812-A7FA-BD4042A3DA00}'
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
Message "Uninstalling " + $ProductId$ + " ..."
if FileExists($IniFile$)
Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
Winbatch_uninstall_msi_old
sub_check_exitcode
endif
endif
if FileExists($UninstallProgram$)
comment "Uninstall program found, starting uninstall"
Winbatch_uninstall
@@ -30,19 +38,13 @@ comment "Delete program shortcuts"
LinkFolder_uninstall
[Winbatch_uninstall]
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
; "$UninstallProgram$" /S
;
; === Inno Setup ========================================================================================
; "$UninstallProgram$" /silent /norestart
rundll32 advpack.dll,LaunchINFSection $InstallInf$,UnInstall
[Winbatch_uninstall_msi_old]
msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi]
rundll32 advpack.dll,LaunchINFSection %ScriptPath%\X86FILE,UnInstall
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
[Files_uninstall]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):

11
CLIENT_DATA/opsi-microsoft.sysinternalssuite.ini Normal file
View File

@@ -0,0 +1,11 @@
[X86]
MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
MsiId32={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
[X86_64]
MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
MsiId64={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
[COMMON]
PN=name
VERSION=version

41
CLIENT_DATA/setup32.ins
View File

@@ -6,8 +6,11 @@
[Actions]
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$
; DefVar $MsiId$
DefVar $MsiIdOld$
DefVar $UninstallProgram$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
@@ -19,16 +22,27 @@ DefVar $LicensePool$
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
; and adds the following variables:
; from builder-product.cfg : all variables definded by attribute WINST[index]
; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE
; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL
; auto generated winst-variables
; $IconFile$: path to product picture
;
@@BUILDER_VARIABLES@@
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
;$ProductId$ should be the name of the product in opsi
; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator
Set $ProductId$ = "sysinternalssuite"
Set $ProductId$ = "microsoft.sysinternalssuite"
Set $MinimumSpace$ = "15 MB"
; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\Sysinternals Suite"
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
Set $LicenseRequired$ = "false"
Set $LicensePool$ = "p_" + $ProductId$
; ----------------------------------------------------------------
@@ -41,10 +55,10 @@ else
comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
; if FileExists("%ScriptPath%\delsub32.ins")
; comment "Start uninstall sub section"
; Sub "%ScriptPath%\delsub32.ins"
; endif
if FileExists("%ScriptPath%\delsub32.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub32.ins"
endif
Message "Installing " + $ProductId$ + " ..."
@@ -78,18 +92,13 @@ else
endif
[Winbatch_install]
; Choose one of the following examples as basis for your installation
; You can use $LicenseKey$ var to pass a license key to the installer
;
rundll32 setupapi,InstallHinfSection DefaultInstall 132 %ScriptPath%\Install_SysinternalsSuite.inf
rundll32 setupapi,InstallHinfSection DefaultInstall 132 %ScriptPath%\AcceptEULA.inf
;
rundll32 setupapi,InstallHinfSection DefaultInstall 132 $InstallInf$
; rundll32 setupapi,InstallHinfSection DefaultInstall 132 $AcceptInf$
[Files_install]
; copy the ini file to the InstallDir
copy "$IniCfgFile$" "$InstallDir$"
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"

54
CLIENT_DATA/uninstall32.ins
View File

@@ -6,9 +6,12 @@
[Actions]
requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$
; DefVar $MsiId$
DefVar $MsiIdOld$
DefVar $UninstallProgram$
DefVar $LogDir$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $ExitCode$
DefVar $ProductId$
DefVar $InstallDir$
@@ -17,10 +20,20 @@ DefVar $LicensePool$
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
; and adds the following variables:
; from builder-product.cfg : all variables definded by attribute WINST[index]
; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE
; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL
; auto generated winst-variables
; $IconFile$: path to product picture
;
@@BUILDER_VARIABLES@@
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
Set $ProductId$ = "sysinternalssuite"
Set $ProductId$ = "microsoft.sysinternalssuite"
Set $InstallDir$ = "%ProgramFiles32Dir%\Sysinternals Suite"
Set $LicenseRequired$ = "false"
Set $LicensePool$ = "p_" + $ProductId$
@@ -32,10 +45,10 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
Message "Uninstalling " + $ProductId$ + " ..."
; if FileExists("%ScriptPath%\delsub32.ins")
; comment "Start uninstall sub section"
; Sub "%ScriptPath%\delsub32.ins"
; endif
if FileExists("%ScriptPath%\delsub32.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub32.ins"
endif
if $LicenseRequired$ = "true"
comment "Licensing required, free license used"
@@ -43,23 +56,16 @@ if $LicenseRequired$ = "true"
endif
[Sub_free_license]
if opsiLicenseManagementEnabled
comment "License management is enabled and will be used"
comment "Trying to free license used for the product"
DefVar $result$
Set $result$ = FreeLicense($LicensePool$)
; If there is an assignment of a license pool to the product, it is possible to use
; Set $result$ = FreeLicense("", $ProductId$)
;
; If there is an assignment of a license pool to a windows software id, it is possible to use
; DefVar $WindowsSoftwareId$
; $WindowsSoftwareId$ = "..."
; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)
else
LogError "Error: licensing required, but license management not enabled"
isFatalError
endif
comment "License management is enabled and will be used"
comment "Trying to free license used for the product"
DefVar $result$
Set $result$ = FreeLicense($LicensePool$)
; If there is an assignment of a license pool to the product, it is possible to use
; Set $result$ = FreeLicense("", $ProductId$)
;
; If there is an assignment of a license pool to a windows software id, it is possible to use
; DefVar $WindowsSoftwareId$
; $WindowsSoftwareId$ = "..."
; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)