Code

Changeset 553584 in wireshark.wireshark


Ignore:
Timestamp:
06/19/2019 06:56:00 AM (6 months ago)
Author:
isnoguter
Branches:
master
Children:
3c8b0a
Parents:
eaa95e
git-author:
Dominik Daehn <isnoguter@…> (06/19/2019 06:56:00 AM)
git-committer:
Dominik Daehn <isnoguter@…> (06/19/2019 06:56:00 AM)
Message:

change LogDir?; add ProductProperty? desktoplink, custom-post-install, custom-post-uninstall

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/delsub3264.ins

    r51947a r553584  
    7272LinkFolder_uninstall 
    7373 
     74DefVar $Property_CustomPostUninstall$ 
     75Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none") 
     76if not ($Property_CustomPostUninstall$ = "none") 
     77        comment "Include custom post uninstall file" 
     78        if FileExists("%ScriptPath%\custom\" + $Property_CustomPostUninstall$) 
     79                sub_CustomPostUninstall 
     80        else 
     81                LogError "Include script NOT exists (" + $Property_CustomPostUninstall$ +")" 
     82        endif 
     83endif 
     84 
    7485[Winbatch_uninstall_old_32] 
    7586"$UninstallProgramOld32$" /S 
     
    107118; Example of deleting a shortcut from AllUsers desktop: 
    108119; 
    109 ; set_basefolder common_desktopdirectory 
    110 ; set_subfolder "" 
    111 ; delete_element $ProductId$ 
     120set_basefolder common_desktopdirectory 
     121set_subfolder "" 
     122delete_element $NAME$ 
     123 
     124[sub_CustomPostUninstall] 
     125include_insert "%ScriptPath%\custom\" + $Property_CustomPostUninstall$ 
    112126 
    113127[Sub_check_exitcode] 
  • CLIENT_DATA/setup3264.ins

    r51947a r553584  
    2626DefVar $OLD_RELEASE$ 
    2727 
     28;Property Variables 
     29DefVar $Property_CustomPostInstall$ 
     30DefVar $Property_DesktopLink$ 
     31 
    2832Set $INST_SystemType$ = GetSystemType 
    2933set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    3034 
    31 Set $LogDir$ = "%SystemDrive%\tmp" 
     35Set $LogDir$ = "%opsiLogDir%" 
    3236 
    3337; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh 
     
    8286                comment "Create shortcuts" 
    8387                LinkFolder_install 
     88                Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") 
     89                if ($Property_DesktopLink$ = "true")             
     90                        LinkFolder_install_DesktopLink_32 
     91                endif 
    8492        endif 
    8593 
     
    96104                comment "Create shortcuts" 
    97105                LinkFolder_install 
     106                Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") 
     107                if ($Property_DesktopLink$ = "true") 
     108                        LinkFolder_install_DesktopLink_64 
     109                endif 
     110        endif 
     111         
     112        Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none") 
     113        if not ($Property_CustomPostInstall$ = "none") 
     114                comment "Include custom post install file" 
     115                if FileExists("%ScriptPath%\custom\" + $Property_CustomPostInstall$) 
     116                        sub_CustomPostInstall 
     117                else 
     118                        LogError "Include script NOT exists (" + $Property_CustomPostInstall$ +")" 
     119                endif 
    98120        endif 
    99121         
     
    163185;       icon_index: 2 
    164186; end_link 
     187 
     188[LinkFolder_install_DesktopLink_32] 
     189; 
     190; Example of creating an shortcut to the installed exe on AllUsers desktop: 
     191; 
     192set_basefolder common_desktopdirectory 
     193set_subfolder "" 
     194; 
     195set_link 
     196        name: $NAME$ 
     197        target: "$InstallDir32$\Wireshark.exe" 
     198        parameters: 
     199        working_dir: $InstallDir32$ 
     200        icon_file: 
     201        icon_index: 
     202end_link 
     203 
     204[LinkFolder_install_DesktopLink_64] 
     205; 
     206; Example of creating an shortcut to the installed exe on AllUsers desktop: 
     207; 
     208set_basefolder common_desktopdirectory 
     209set_subfolder "" 
     210; 
     211set_link 
     212        name: $NAME$ 
     213        target: "$InstallDir64$\Wireshark.exe" 
     214        parameters: 
     215        working_dir: $InstallDir64$ 
     216        icon_file: 
     217        icon_index: 
     218end_link 
     219 
     220[sub_CustomPostInstall] 
     221include_insert "%ScriptPath%\custom\" + $Property_CustomPostInstall$ 
    165222 
    166223[Sub_check_exitcode] 
  • CLIENT_DATA/uninstall3264.ins

    r133c7d r553584  
    2828set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    2929 
    30 Set $LogDir$ = "%SystemDrive%\tmp" 
     30Set $LogDir$ = "%opsiLogDir%" 
    3131 
    3232; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh 
  • OPSI/control

    r51947a r553584  
    3131default: ["system specific"] 
    3232 
     33[ProductProperty] 
     34type: bool 
     35name: desktoplink 
     36description: Show Desktop Link on/off 
     37default: False 
     38 
     39[ProductProperty] 
     40type: unicode 
     41name: custom-post-install 
     42multivalue: False 
     43editable: True 
     44description: Define filename for include script in custom directory after installation 
     45values: ["none"] 
     46default: ["none"] 
     47 
     48[ProductProperty] 
     49type: unicode 
     50name: custom-post-uninstall 
     51multivalue: False 
     52editable: True 
     53description: Define filename for include script in custom directory after uninstallation 
     54values: ["none"] 
     55default: ["none"] 
     56 
    3357[ProductDependency] 
    3458action: setup 
Note: See TracChangeset for help on using the changeset viewer.