From fc93c6850a527322dc902bbb5e83584844f68b5d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 14 Mar 2013 19:28:58 +0100 Subject: [PATCH] update to new opsi builder template --- CLIENT_DATA/delsub32.ins | 31 ++++++++++++++++---- CLIENT_DATA/login.ins | 24 ++++++++++++++++ CLIENT_DATA/opsi-nomachine.nxplayer.ini | 5 ++++ CLIENT_DATA/setup32.ins | 38 +++++++++++++------------ CLIENT_DATA/uninstall32.ins | 16 +++++++---- OPSI/control | 9 ------ builder-product.cfg | 9 ++++-- nomachine.jpg.sha1sum | 1 + nx.png.sha1sum | 1 - 9 files changed, 93 insertions(+), 41 deletions(-) create mode 100644 CLIENT_DATA/login.ins create mode 100644 CLIENT_DATA/opsi-nomachine.nxplayer.ini create mode 100644 nomachine.jpg.sha1sum delete mode 100644 nx.png.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index abd59bf..4a4baca 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,13 +1,28 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\unins000.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ +Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" -Message "Uninstalling " + $ProductId$ + " ..." +if FileExists($IniFile$) + Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","") +endif +Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." +if FileExists($IniFile$) + Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ + if FileExists($UninstallProgramOld$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old + sub_check_exitcode + endif +endif if FileExists($UninstallProgram$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall @@ -23,14 +38,18 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall +[Winbatch_uninstall_old] +"$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + + [Winbatch_uninstall] -"$UninstallProgram$" /silent /norestart +"$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel [Files_uninstall] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -; delete -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins new file mode 100644 index 0000000..7b85744 --- /dev/null +++ b/CLIENT_DATA/login.ins @@ -0,0 +1,24 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib gmbh +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/en/credits/ + +[Actions] +Message "Profile Patch for VLC ...." + +comment "Did we run this script before ? - and set version stamp in profile" +if getValue("installationstate", getProductMap) = "installed" + comment "Product is installed" + if not (scriptWasExecutedBefore) + comment "loginscript was not run yet " + Files_profile_copy + Registry_currentuser_set + endif +endif + +[Files_profile_copy] +copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME" + +[Registry_currentuser_set] +openkey [HKCU\Software\ACME] +set "show_greeting_window" = "no" diff --git a/CLIENT_DATA/opsi-nomachine.nxplayer.ini b/CLIENT_DATA/opsi-nomachine.nxplayer.ini new file mode 100644 index 0000000..41585d5 --- /dev/null +++ b/CLIENT_DATA/opsi-nomachine.nxplayer.ini @@ -0,0 +1,5 @@ +[X86] + +[COMMON] +PN=name +VERSION=version diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index f655ffe..ee5edba 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,17 +1,23 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -31,28 +37,30 @@ Set $LogDir$ = "%SystemDrive%\tmp" ;$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$ = "nomachine.nxplayer" -Set $MinimumSpace$ = "15 MB" +Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\NX Player for Windows" +Set $InstallDir$ = "%ProgramFiles32Dir%\NoMachine Player" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" + if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError + isFatalError "No Space" ; Stop process and set installation status to failed else comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ if FileExists("%ScriptPath%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" endif - Message "Installing " + $ProductId$ + " ..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install Sub_check_exitcode @@ -65,21 +73,15 @@ else comment "Create shortcuts" LinkFolder_install - comment "Test for installation success" - ; Test if software marked as installed in registry - ; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "") - ; logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found" - ; isFatalError - ; else - ; comment "Successful Installation" - ; endif - endif [Winbatch_install] -"$InstallExe$" /silent /norestart +"$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES [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$" diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 4047360..b89b783 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,16 +1,22 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -27,13 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "nomachine.nxplayer" -Set $InstallDir$ = "%ProgramFiles32Dir%\NX Player for Windows" +Set $InstallDir$ = "%ProgramFiles32Dir%\NoMachine Player" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." diff --git a/OPSI/control b/OPSI/control index bfdbe72..a76ca9d 100644 --- a/OPSI/control +++ b/OPSI/control @@ -21,12 +21,3 @@ onceScript: customScript: userLoginScript: -[ProductProperty] -type: unicode -name: install_architecture -multivalue: False -editable: False -description: which architecture (32/64 bit) has to be installed -values: ["32 only", "64 only", "both", "system specific"] -default: ["system specific"] - diff --git a/builder-product.cfg b/builder-product.cfg index fcd00f8..7202c7b 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="nomachine.com" PN="nomachine.nxplayer" +NAME="NoMachine Player" +DESCRIPTION="NoMachine Player is the new client interface to connect you to your remote desktop or host." VERSION="4.0.181.5" RELEASE="3" PRIORITY="0" @@ -12,8 +14,8 @@ ADVICE="" # Valid value: restricted | public TYPE="public" -DL_FILE[0]="nx.png" -DL_SOURCE[0]="http://img.vivaolinux.com.br/comunidades/imagens/fotos/nx.png" +DL_FILE[0]="nomachine.jpg" +DL_SOURCE[0]="http://apps.schwartzplan.net/dotneticons/nomachine.jpg" DL_FILE[1]="nxplayer-$VERSION.exe" DL_SOURCE[1]="http://64.34.173.142/download/4.0/Windows/nxplayer-4.0.181-5.exe" @@ -23,3 +25,6 @@ DL_WINST_NAME[1]=InstallExe # File array index for the image showing while installing the program ICON_DL_INDEX=0 +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg" +OPSI_INI_VALUE[0]="Uninstall NoMachine Player\unins000.exe" diff --git a/nomachine.jpg.sha1sum b/nomachine.jpg.sha1sum new file mode 100644 index 0000000..0f4a031 --- /dev/null +++ b/nomachine.jpg.sha1sum @@ -0,0 +1 @@ +7eb24e8f338cfd5bd460c693818ae19b6ace8157 /home/mario/.opsi-dist-cache/nomachine.nxplayer-4.0.181.5//nomachine.jpg diff --git a/nx.png.sha1sum b/nx.png.sha1sum deleted file mode 100644 index 169e713..0000000 --- a/nx.png.sha1sum +++ /dev/null @@ -1 +0,0 @@ -08a378377591763d96c6a37da8d3abb16f9f9def /home/mario/.opsi-dist-cache/nomachine.nxclient-3.5.0.7//nx.png