Code

Changeset 2b5e4d in openvpn.manager


Ignore:
Timestamp:
03/08/2014 07:12:57 AM (6 years ago)
Author:
geos_one
Branches:
master
Children:
4fc1f9
Parents:
109108
git-author:
Mario Fetka <mario.fetka@…> (03/08/2014 07:12:57 AM)
git-committer:
Mario Fetka <mario.fetka@…> (03/08/2014 07:12:57 AM)
Message:

make it work the zip dont provide all the files so also extract the setup that is not solent install aware

Files:
2 added
1 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/setup3264.ins

    r109108 r2b5e4d  
    77requiredWinstVersion >= "4.11.2.6" 
    88 
    9 DefVar $UninstallProgram$ 
    10 DefVar $UninstallProgramOld$ 
    11 DefVar $IniFile$ 
     9DefVar $UninstallProgram32$ 
     10DefVar $UninstallProgramOld32$ 
     11DefVar $IniFile32$ 
     12DefVar $UninstallProgram64$ 
     13DefVar $UninstallProgramOld64$ 
     14DefVar $IniFile64$ 
    1215DefVar $IniCfgFile$ 
    1316DefVar $LogDir$ 
    1417DefVar $ProductId$   
    1518DefVar $MinimumSpace$ 
    16 DefVar $InstallDir$ 
     19DefVar $InstallDir32$ 
     20DefVar $InstallDir64$ 
    1721DefVar $ExitCode$ 
     22DefVar $INST_SystemType$ 
     23DefVar $INST_architecture$ 
    1824DefVar $OLD_VERSION$ 
    1925DefVar $OLD_CREATOR_TAG$ 
    2026DefVar $OLD_RELEASE$ 
     27 
     28Set $INST_SystemType$ = GetSystemType 
     29set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    2130 
    2231Set $LogDir$ = "%SystemDrive%\tmp" 
     
    3847; therefore please: only lower letters, no umlauts,  
    3948; no white space use '-' as a seperator 
    40 Set $MinimumSpace$    = "1 MB" 
     49Set $MinimumSpace$    = "10 MB" 
    4150; the path were we find the product after the installation 
    42 Set $InstallDir$      = "%ProgramFiles32Dir%\OpenVPN Manager" 
     51Set $InstallDir32$      = "%ProgramFiles32Dir%\OpenVPN Manager" 
     52Set $InstallDir64$      = "%ProgramFiles64Dir%\OpenVPN Manager" 
    4353; ---------------------------------------------------------------- 
    4454 
     
    4757if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) 
    4858        LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ 
    49         isFatalError "No Space" 
     59        isFatalError 
    5060        ; Stop process and set installation status to failed 
    5161else 
     
    5363        ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ 
    5464         
    55         if FileExists("%ScriptPath%\delsub32.ins") 
     65        if FileExists("%ScriptPath%\delsub3264.ins") 
    5666                comment "Start uninstall sub section" 
    57                 Sub "%ScriptPath%\delsub32.ins" 
     67                Sub "%ScriptPath%\delsub3264.ins" 
    5868        endif 
    5969         
    60         Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." 
    61          
    62         comment "Start setup program" 
    63         ChangeDirectory "%SCRIPTPATH%" 
    64         comment "Copy files" 
    65         Files_install /32Bit 
    66          
    67         Winbatch_install 
    68         Sub_check_exitcode 
    69          
    70         comment "Patch Registry" 
    71         Registry_install /32Bit 
    72          
    73         comment "Create shortcuts" 
    74         LinkFolder_install 
     70        comment "installing" 
     71 
     72        if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") 
     73                Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." 
     74                comment "Start setup program" 
     75                ChangeDirectory "%SCRIPTPATH%" 
     76                comment "Copy files" 
     77                Files_install_32 /32Bit 
     78                Winbatch_install_32 
     79                Sub_check_exitcode 
     80                comment "Patch Registry" 
     81                Registry_install /32Bit 
     82                comment "Create shortcuts" 
     83                LinkFolder_install 
     84        endif 
     85 
     86        if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) 
     87                Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." 
     88                comment "Start setup program" 
     89                ChangeDirectory "%SCRIPTPATH%" 
     90                comment "Copy files" 
     91                Files_install_64 /64Bit 
     92                Winbatch_install_64 
     93                Sub_check_exitcode 
     94                comment "Patch Registry" 
     95                Registry_install /64Bit 
     96                comment "Create shortcuts" 
     97                LinkFolder_install 
     98        endif 
    7599         
    76100endif 
    77101 
    78 [Winbatch_install] 
    79 "$InstallDir$\OpenVPNManager.exe" -install 
     102[Winbatch_install_32] 
     103"$InstallDir32$\OpenVPNManagerService.exe" INSTALL  "%ProgramFiles32Dir%\OpenVPN\\bin\openvpn.exe" 
     104"$InstallDir32$\OpenVPNManager.exe" -install 
    80105 
    81 [Files_install] 
     106[Files_install_32] 
    82107; copy the ini file to the InstallDir 
    83 copy "$IniCfgFile$" "$InstallDir$" 
     108copy "$IniCfgFile$" "$InstallDir32$" 
    84109 
    85110; Example of recursively copying some files into the installation directory: 
    86111; 
    87 copy -s "%ScriptPath%\X86\*.*" "$InstallDir$" 
     112; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" 
     113 
     114[Winbatch_install_64] 
     115"$InstallDir64$\OpenVPNManagerService.exe" INSTALL  "%ProgramFiles64Dir%\OpenVPN\\bin\openvpn.exe" 
     116"$InstallDir64$\OpenVPNManager.exe" -install 
     117 
     118[Files_install_64] 
     119; copy the ini file to the InstallDir 
     120copy "$IniCfgFile$" "$InstallDir64$" 
     121 
     122; Example of recursively copying some files into the installation directory: 
     123; 
     124; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$" 
    88125 
    89126[Registry_install] 
  • CLIENT_DATA/uninstall3264.ins

    r822551 r2b5e4d  
    77requiredWinstVersion >= "4.11.2.6" 
    88 
    9 DefVar $UninstallProgram$ 
    10 DefVar $UninstallProgramOld$ 
    11 DefVar $IniFile$ 
     9DefVar $UninstallProgram32$ 
     10DefVar $UninstallProgramOld32$ 
     11DefVar $IniFile32$ 
     12DefVar $UninstallProgram64$ 
     13DefVar $UninstallProgramOld64$ 
     14DefVar $IniFile64$ 
    1215DefVar $IniCfgFile$ 
    1316DefVar $LogDir$ 
    1417DefVar $ExitCode$ 
    1518DefVar $ProductId$ 
    16 DefVar $InstallDir$ 
     19DefVar $InstallDir32$ 
     20DefVar $InstallDir64$ 
     21DefVar $INST_SystemType$ 
     22DefVar $INST_architecture$ 
    1723DefVar $OLD_VERSION$ 
    1824DefVar $OLD_CREATOR_TAG$ 
    1925DefVar $OLD_RELEASE$ 
     26 
     27Set $INST_SystemType$ = GetSystemType 
     28set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    2029 
    2130Set $LogDir$ = "%SystemDrive%\tmp" 
     
    3443; - Please edit the following values                             - 
    3544; ---------------------------------------------------------------- 
    36 Set $InstallDir$      = "%ProgramFiles32Dir%\OpenVPN Manager" 
     45Set $InstallDir32$    = "%ProgramFiles32Dir%\OpenVPN Manager" 
     46Set $InstallDir64$    = "%ProgramFiles64Dir%\OpenVPN Manager" 
    3747; ---------------------------------------------------------------- 
    3848 
     
    4454Message "Uninstalling " + $ProductId$ + " ..." 
    4555 
    46 if FileExists("%ScriptPath%\delsub32.ins") 
     56if FileExists("%ScriptPath%\delsub3264.ins") 
    4757        comment "Start uninstall sub section" 
    48         Sub "%ScriptPath%\delsub32.ins" 
     58        Sub "%ScriptPath%\delsub3264.ins" 
    4959endif 
    5060 
  • OPSI/control

    r723f31 r2b5e4d  
    1414licenseRequired: False 
    1515productClasses:  
    16 setupScript: setup32.ins 
    17 uninstallScript: uninstall32.ins 
     16setupScript: setup3264.ins 
     17uninstallScript: uninstall3264.ins 
    1818updateScript:  
    1919alwaysScript:  
     
    2121customScript:  
    2222userLoginScript: 
     23 
     24[ProductProperty] 
     25type: unicode 
     26name: install_architecture 
     27multivalue: False 
     28editable: False 
     29description: which architecture (32/64 bit) has to be installed 
     30values: ["32 only", "64 only", "both", "system specific"] 
     31default: ["system specific"] 
    2332 
    2433[ProductDependency] 
  • builder-product.cfg

    r109108 r2b5e4d  
    1 ############################ 
    2 # Setup product information  
    3 ############################ 
    41VENDOR="jochenwierum.github.com" 
    52PN="openvpn.manager" 
     
    2017DL_FILE[1]="openvpnmanager_${VERSION}_bin.zip" 
    2118DL_SOURCE[1]="http://openvpn.jowisoftware.de/downloads/openvpnmanager_${VERSION}_bin.zip" 
    22 DL_ARCH[1]="X86" 
     19DL_ARCH[1]="ALL" 
    2320DL_EXTRACT_FORMAT[1]="unzip" 
    2421 
     22DL_FILE[2]="openvpnmanager_${VERSION}_setup.exe" 
     23DL_SOURCE[2]="http://openvpn.jowisoftware.de/downloads/openvpnmanager_${VERSION}_setup.exe" 
     24DL_ARCH[2]="TEMP" 
     25DL_EXTRACT_FORMAT[2]="7zip" 
     26 
     27# File array index for the image showing while installing the program 
     28ICON_DL_INDEX=0 
     29 
    2530OPSI_INI_SECTION[0]="X86" 
    26 OPSI_INI_OPTION[0]="UninstallProg" 
     31OPSI_INI_OPTION[0]="UninstallProg32" 
    2732OPSI_INI_VALUE[0]="OpenVPNManager.exe" 
    2833 
     34OPSI_INI_SECTION[1]="X86_64" 
     35OPSI_INI_OPTION[1]="UninstallProg64" 
     36OPSI_INI_VALUE[1]="OpenVPNManager.exe" 
     37 
  • builder-targets-cb.sh

    r822551 r2b5e4d  
    2424    builder_cleanup 
    2525} 
     26 
     27function create() { 
     28    echo "Create" 
     29    builder_create 
     30 
     31        mv $INST_DIR/CLIENT_DATA/TEMP/\$COMMONFILES/OpenVPN\ Manager/* $INST_DIR/CLIENT_DATA/ALL 
     32        rm -rf $INST_DIR/CLIENT_DATA/TEMP 
     33} 
Note: See TracChangeset for help on using the changeset viewer.