This commit is contained in:
Mario Fetka 2016-09-07 16:20:37 +02:00
parent d2dd725ca7
commit 4fc91fa773
9 changed files with 68 additions and 181 deletions

View File

@ -23,14 +23,14 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall"
; Winbatch_uninstall_old_32
; sub_check_exitcode
Winbatch_uninstall_old_32
sub_check_exitcode
endif
endif
if FileExists($UninstallProgram32$)
comment "Uninstall program found, starting uninstall"
; Winbatch_uninstall_32
; sub_check_exitcode
Winbatch_uninstall_32
sub_check_exitcode
endif
comment "Delete files"
@ -52,14 +52,14 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall"
; Winbatch_uninstall_old_64
; sub_check_exitcode
Winbatch_uninstall_old_64
sub_check_exitcode
endif
endif
if FileExists($UninstallProgram64$)
comment "Uninstall program found, starting uninstall"
; Winbatch_uninstall_64
; sub_check_exitcode
Winbatch_uninstall_64
sub_check_exitcode
endif
comment "Delete files"
@ -72,26 +72,10 @@ comment "Delete program shortcuts"
LinkFolder_uninstall
[Winbatch_uninstall_old_32]
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
; maby better Call as
; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
; "$UninstallProgramOld32$" /S
;
; === Inno Setup ========================================================================================
; "$UninstallProgramOld32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
"$UninstallProgramOld32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
[Winbatch_uninstall_32]
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
; maby better Call as
; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
; "$UninstallProgram32$" /S
;
; === Inno Setup ========================================================================================
; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
"$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
[Files_uninstall_32]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@ -99,26 +83,10 @@ LinkFolder_uninstall
delete -sf "$InstallDir32$\"
[Winbatch_uninstall_old_64]
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
; maby better Call as
; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
; "$UninstallProgramOld64$" /S
;
; === Inno Setup ========================================================================================
; "$UninstallProgramOld64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
"$UninstallProgramOld64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
[Winbatch_uninstall_64]
; Choose one of the following examples as basis for program uninstall
;
; === Nullsoft Scriptable Install System ================================================================
; maby better Call as
; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
; "$UninstallProgram64$" /S
;
; === Inno Setup ========================================================================================
; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
"$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
[Files_uninstall_64]
; Example for recursively deleting the installation directory:
@ -133,14 +101,14 @@ del -sf "$InstallDir64$\"
[LinkFolder_uninstall]
; Example of deleting a folder from AllUsers startmenu:
;
set_basefolder common_programs
delete_subfolder $NAME$
; set_basefolder common_programs
; delete_subfolder $ProductId$
;
; Example of deleting a shortcut from AllUsers desktop:
;
set_basefolder common_desktopdirectory
set_subfolder ""
delete_element $NAME$
; set_basefolder common_desktopdirectory
; set_subfolder ""
; delete_element $ProductId$
[Sub_check_exitcode]
comment "Test for installation success via exit code"

View File

@ -46,7 +46,7 @@ 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 $MinimumSpace$ = "20 MB"
Set $MinimumSpace$ = "1 MB"
; the path were we find the product after the installation
Set $InstallDir32$ = "%ProgramFiles32Dir%\XnViewMP"
Set $InstallDir64$ = "%ProgramFiles64Dir%\XnViewMP"
@ -73,58 +73,34 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
; Winbatch_install_32
; Sub_check_exitcode
Winbatch_install_32
Sub_check_exitcode
comment "Copy files"
Files_install_32 /32Bit
comment "Patch Registry"
Registry_install /32Bit
comment "Create shortcuts"
LinkFolder_install_64
LinkFolder_install
endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
; Winbatch_install_64
; Sub_check_exitcode
Winbatch_install_64
Sub_check_exitcode
comment "Copy files"
Files_install_64 /64Bit
comment "Patch Registry"
Registry_install /64Bit
comment "Create shortcuts"
LinkFolder_install_64
LinkFolder_install
endif
endif
[Winbatch_install_32]
; Choose one of the following examples as basis for your installation
; You can use $LicenseKey$ var to pass a license key to the installer
;
; === Nullsoft Scriptable Install System ================================================================
; "%ScriptPath%\Setup.exe" /S
;
; === MSI package =======================================================================================
; You may use the parameter PIDKEY=$Licensekey$
; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
;
; === InstallShield + MSI=====================================================================================
; Attention: The path to the log file should not contain any whitespaces
; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=1 REBOOT=ReallySuppress"
; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
;
; === InstallShield =====================================================================================
; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
; You may use an answer file by the parameter /f1"c:\setup.iss"
; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt"
;
; === Inno Setup ========================================================================================
; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
; You may create setup answer file by: setup.exe /SAVEINF="filename"
; You may use an answer file by the parameter /LOADINF="filename"
; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
"$Install32Exe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES /DIR="$InstallDir32$"
[Files_install_32]
; copy the ini file to the InstallDir
@ -133,34 +109,9 @@ copy "$IniCfgFile$" "$InstallDir32$"
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
copy -s "%ScriptPath%\X86\XnViewMP\*.*" "$InstallDir32$"
[Winbatch_install_64]
; Choose one of the following examples as basis for your installation
; You can use $LicenseKey$ var to pass a license key to the installer
;
; === Nullsoft Scriptable Install System ================================================================
; "%ScriptPath%\Setup.exe" /S
;
; === MSI package =======================================================================================
; You may use the parameter PIDKEY=$Licensekey$
; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
;
; === InstallShield + MSI=====================================================================================
; Attention: The path to the log file should not contain any whitespaces
; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=1 REBOOT=ReallySuppress"
; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
;
; === InstallShield =====================================================================================
; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
; You may use an answer file by the parameter /f1"c:\setup.iss"
; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt"
;
; === Inno Setup ========================================================================================
; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
; You may create setup answer file by: setup.exe /SAVEINF="filename"
; You may use an answer file by the parameter /LOADINF="filename"
; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
"$Install64Exe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES /DIR="$InstallDir64$"
[Files_install_64]
; copy the ini file to the InstallDir
@ -169,7 +120,6 @@ copy "$IniCfgFile$" "$InstallDir64$"
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
copy -s "%ScriptPath%\X86_64\XnViewMP\*.*" "$InstallDir64$"
[Registry_install]
; Example of setting some values of an registry key:
@ -179,73 +129,43 @@ copy -s "%ScriptPath%\X86_64\XnViewMP\*.*" "$InstallDir64$"
; set "name2" = REG_DWORD:0001
; set "name3" = REG_BINARY:00 af 99 cd
[LinkFolder_install_32]
[LinkFolder_install]
set_basefolder common_desktopdirectory
set_subfolder ""
delete_element "XnViewMP"
; Example of deleting a folder from AllUsers startmenu:
;
set_basefolder common_programs
delete_subfolder $NAME$
; set_basefolder common_programs
; delete_subfolder $ProductId$
;
; Example of creating an shortcut to the installed exe in AllUsers startmenu:
;
set_basefolder common_programs
set_subfolder $NAME$
set_link
name: $NAME$
target: "$InstallDir32$\xnview.exe"
parameters:
working_dir: $InstallDir32$
icon_file:
icon_index:
end_link
; set_basefolder common_programs
; set_subfolder $ProductId$
;
; set_link
; name: $ProductId$
; target: <path to the program>
; parameters:
; working_dir: $InstallDir$
; icon_file:
; icon_index:
; end_link
;
; Example of creating an shortcut to the installed exe on AllUsers desktop:
;
set_basefolder common_desktopdirectory
set_subfolder ""
; set_basefolder common_desktopdirectory
; set_subfolder ""
;
set_link
name: $NAME$
target: "$InstallDir32$\xnview.exe"
parameters:
working_dir: $InstallDir32$
icon_file:
icon_index:
end_link
[LinkFolder_install_64]
; Example of deleting a folder from AllUsers startmenu:
;
set_basefolder common_programs
delete_subfolder $NAME$
;
; Example of creating an shortcut to the installed exe in AllUsers startmenu:
;
set_basefolder common_programs
set_subfolder $NAME$
set_link
name: $NAME$
target: "$InstallDir64$\xnview.exe"
parameters:
working_dir: $InstallDir64$
icon_file:
icon_index:
end_link
;
; Example of creating an shortcut to the installed exe on AllUsers desktop:
;
set_basefolder common_desktopdirectory
set_subfolder ""
;
set_link
name: $NAME$
target: "$InstallDir64$\xnview.exe"
parameters:
working_dir: $InstallDir64$
icon_file:
icon_index:
end_link
; set_link
; name: $ProductId$
; target: <path to the program>
; parameters: <some_param>
; working_dir: $InstallDir$
; icon_file: <path to icon file>
; icon_index: 2
; end_link
[Sub_check_exitcode]
comment "Test for installation success via exit code"

View File

@ -1 +0,0 @@
d7c30b826abfc6e5917baa195ed7f62db26bc823 /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.53/X86_64/XnViewMP-0.53-win-x64.zip

View File

@ -1 +0,0 @@
938f4785857a767d873896295cd7ec64922b669c /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.53/X86/XnViewMP-0.53-win.zip

View File

@ -0,0 +1 @@
fb6ca6af7bc28dee6bb9683ae7a4fb7d6cdfdac7 /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.81/X86/XnViewMP-0.81-win-x32.exe

View File

@ -0,0 +1 @@
ca7ff1aa25de6eff6f60b76bab4db55b48cd687e /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.81/X86_64/XnViewMP-0.81-win-x64.exe

View File

@ -0,0 +1 @@
2cd72ef548dd0db73ddaff74e5231bef6a6acd2c /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.81//app-xnsoft-512.png

View File

@ -5,7 +5,7 @@ VENDOR="xnview.com"
PN="xnview.xnviewmp"
NAME="XnView MP"
DESCRIPTION="XnViewMP is XnView successor, it's a powerfull cross-platform multimedia browser, viewer and converter. Compatible with more than 500 image formats."
VERSION="0.53"
VERSION="0.81"
RELEASE="3"
PRIORITY="0"
ADVICE=""
@ -14,28 +14,27 @@ ADVICE=""
# Valid value: restricted | public
TYPE="public"
DL_FILE[0]="app-xnsoft-512.png"
DL_SOURCE[0]="http://www.xnview.com/assets/img/app-xnsoft-512.png"
DL_FILE[0]="nxviewsz4df.png"
DL_SOURCE[0]="http://img376.imageshack.us/img376/7526/nxviewsz4df.png"
DL_FILE[1]="XnViewMP-${VERSION}-win.zip"
DL_SOURCE[1]="http://download.xnview.com/XnViewMP-win.zip"
DL_FILE[1]="XnViewMP-${VERSION}-win-x32.exe"
DL_SOURCE[1]="http://download.xnview.com/XnViewMP-win.exe"
DL_ARCH[1]="X86"
DL_EXTRACT_FORMAT[1]="7zip"
DL_WINST_NAME[1]=Install32Exe
DL_FILE[2]="XnViewMP-${VERSION}-win-x64.zip"
DL_SOURCE[2]="http://download.xnview.com/XnViewMP-win-x64.zip"
DL_FILE[2]="XnViewMP-${VERSION}-win-x64.exe"
DL_SOURCE[2]="http://download.xnview.com/XnViewMP-win-x64.exe"
DL_ARCH[2]="X86_64"
DL_EXTRACT_FORMAT[2]="7zip"
DL_WINST_NAME[1]=Install64Exe
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="UninstallProg32"
OPSI_INI_VALUE[0]="XXXXXXXX.exe"
OPSI_INI_VALUE[0]="unins000.exe"
OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="UninstallProg64"
OPSI_INI_VALUE[1]="XXXXXXXX.exe"
OPSI_INI_VALUE[1]="unins000.exe"

View File

@ -1 +0,0 @@
d62218818ef724c3113c4ca0f8016f888209e332 /home/mario/.opsi-dist-cache/xnview.xnviewmp-0.53//nxviewsz4df.png