Skip to content

Commit c956a55

Browse files
committed
chore: Removed unused functions & corrected summary
Signed-off-by: Mia Battad <[email protected]>
1 parent 71e70ad commit c956a55

File tree

2 files changed

+3
-53
lines changed

2 files changed

+3
-53
lines changed

Diff for: install_builder/deadline-cloud-for-houdini.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@
211211
<value>Deadline Cloud for Houdini 19.5-20.5
212212
- Compatible with Houdini 19.5-20.5
213213
- Install the integrated Houdini submitter files to the installation directory.
214-
- Register the plug-in package file with Houdini by setting HOUDINI_PACKAGE_DIR</value>
214+
- Copy the plug-in package file to the Houdini packages directory for each version.
215+
- Register the plug-in package file with Houdini by setting HOUDINI_PACKAGE_DIR on Windows.</value>
215216
</stringParameter>
216217
</parameterList>
217218
<postInstallationActionList>

Diff for: installer/DeadlineCloudForHoudiniSubmitter.xml

+1-52
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,6 @@
3737
<stringParameter name="value"/>
3838
</parameterList>
3939
</actionDefinition>
40-
<actionDefinition name="fnAddLinuxEnvironmentVariable">
41-
<parameterList>
42-
<stringParameter name="name"/>
43-
<stringParameter name="value"/>
44-
<stringParameter name="scope" default="user"/>
45-
</parameterList>
46-
<actionList>
47-
<if>
48-
<conditionRuleList>
49-
<platformTest type="linux"/>
50-
<compareText logic="equals" text="${scope}" value="system"/>
51-
</conditionRuleList>
52-
<actionList>
53-
<!-- InstallBuilder's system-wide Linux implementation does not work (it always writes to the user
54-
environment files like ~/.bashrc and ~/.bash_profile, even as root).
55-
Instead, we cache all environment variables in a global variable, and in the post-installation
56-
steps, we generate a file in /etc/profile.d/ that will get sourced on login. -->
57-
<globalVariables names="_fnAddEnvironmentVariable_list"/>
58-
<setInstallerVariable name="_fnAddEnvironmentVariable_list">
59-
<value>${_fnAddEnvironmentVariable_list}export ${name}=${value}&#xA;</value>
60-
</setInstallerVariable>
61-
</actionList>
62-
<elseActionList>
63-
<!-- Pass through to InstallBuilder implementation -->
64-
<addEnvironmentVariable name="${name}" value="${value}" scope="${scope}"/>
65-
</elseActionList>
66-
</if>
67-
</actionList>
68-
</actionDefinition>
6940
<actionDefinition name="fnAddPathEnvironmentVariable">
7041
<!-- Adds a PATH-like environment variable with options to add to the end or beginning of the PATH -->
7142
<parameterList>
@@ -106,29 +77,7 @@
10677
</setInstallerVariable>
10778
</elseActionList>
10879
</if>
109-
<fnAddLinuxEnvironmentVariable name="${name}" value="${new_value}" scope="${scope}"/>
110-
</actionList>
111-
</actionDefinition>
112-
<actionDefinition name="fnAddDirectoryToLinuxPath">
113-
<!-- This just exists to handle the system-wide Linux implementation (see fnAddLinuxEnvironmentVariable) -->
114-
<parameterList>
115-
<stringParameter name="insertAt" default="end"/>
116-
<stringParameter name="path"/>
117-
<stringParameter name="scope" default="system"/>
118-
</parameterList>
119-
<actionList>
120-
<if>
121-
<conditionRuleList>
122-
<platformTest type="linux"/>
123-
<compareText logic="equals" text="${scope}" value="system"/>
124-
</conditionRuleList>
125-
<actionList>
126-
<fnAddLinuxEnvironmentVariable name="PATH" value="$PATH:${path}" scope="${scope}"/>
127-
</actionList>
128-
<elseActionList>
129-
<addDirectoryToPath insertAt="${insertAt}" path="${path}" scope="${scope}"/>
130-
</elseActionList>
131-
</if>
80+
<addEnvironmentVariable name="${name}" value="${new_value}" scope="${scope}"/>
13281
</actionList>
13382
</actionDefinition>
13483
</functionDefinitionList>

0 commit comments

Comments
 (0)