Skip to content

Commit dbe74bc

Browse files
committed
JBDS-4497 skip creating shortcts in case of installing additional IUs
When DevStudio installed with additional IUs (Installation Units) it is always indicate that devstudio itself installed as requirement, hence shortcuts are created already and can be skipped from automated install configuration.
1 parent 430fb18 commit dbe74bc

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

browser/model/devstudio-autoinstall.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,16 @@ class DevstudioAutoInstallGenerator {
1919
if(additionalLocations) {
2020
additionalLocations = ',' + additionalLocations.trim();
2121
}
22+
let shortcuts;
2223
if (additionalIus) {
2324
additionalIus = ',' + additionalIus.trim();
25+
shortcuts = ['<com.izforge.izpack.panels.ShortcutPanel id="shortcut"/>'];
26+
} else {
27+
shortcuts = ['<com.izforge.izpack.panels.ShortcutPanel id="shortcut">',
28+
'<programGroup name="Red Hat JBoss Developer Studio ' + devstudioVersion + '"/>',
29+
'<shortcut KdeSubstUID="false" categories="" commandLine="" createForAll="false" description="Start Red Hat JBoss Developer Studio ' + devstudioVersion + '" encoding="" group="false" icon="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.ico')) + '" iconIndex="0" initialState="1" mimetype="" name="Red Hat JBoss Developer Studio ' + devstudioVersion + '" target="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.exe')) + '" terminal="" terminalOptions="" tryexec="" type="3" url="" usertype="0" workingDirectory="' + esc(path.join(devstudioInstallDir, 'studio')) + '"/>',
30+
'<shortcut KdeSubstUID="false" categories="" commandLine="" createForAll="false" description="Start Red Hat JBoss Developer Studio ' + devstudioVersion + '" encoding="" group="true" icon="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.ico')) + '" iconIndex="0" initialState="1" mimetype="" name="Red Hat JBoss Developer Studio ' + devstudioVersion + '" target="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.exe')) + '" terminal="" terminalOptions="" tryexec="" type="1" url="" usertype="0" workingDirectory="' + esc(path.join(devstudioInstallDir, 'studio')) + '"/>',
31+
'</com.izforge.izpack.panels.ShortcutPanel>'];
2432
}
2533
let temp =
2634
[
@@ -46,11 +54,7 @@ class DevstudioAutoInstallGenerator {
4654
'<com.jboss.devstudio.core.installer.CreateLinkPanel id="createlink">',
4755
'<jrelocation>' + esc(path.join(jdkInstallDir, 'bin', 'java' + exeSuffix)) + '</jrelocation>',
4856
'</com.jboss.devstudio.core.installer.CreateLinkPanel>',
49-
'<com.izforge.izpack.panels.ShortcutPanel id="shortcut">',
50-
'<programGroup name="Red Hat JBoss Developer Studio ' + devstudioVersion + '"/>',
51-
'<shortcut KdeSubstUID="false" categories="" commandLine="" createForAll="false" description="Start Red Hat JBoss Developer Studio ' + devstudioVersion + '" encoding="" group="false" icon="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.ico')) + '" iconIndex="0" initialState="1" mimetype="" name="Red Hat JBoss Developer Studio ' + devstudioVersion + '" target="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.exe')) + '" terminal="" terminalOptions="" tryexec="" type="3" url="" usertype="0" workingDirectory="' + esc(path.join(devstudioInstallDir, 'studio')) + '"/>',
52-
'<shortcut KdeSubstUID="false" categories="" commandLine="" createForAll="false" description="Start Red Hat JBoss Developer Studio ' + devstudioVersion + '" encoding="" group="true" icon="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.ico')) + '" iconIndex="0" initialState="1" mimetype="" name="Red Hat JBoss Developer Studio ' + devstudioVersion + '" target="' + esc(path.join(devstudioInstallDir, 'studio', 'devstudio.exe')) + '" terminal="" terminalOptions="" tryexec="" type="1" url="" usertype="0" workingDirectory="' + esc(path.join(devstudioInstallDir, 'studio')) + '"/>',
53-
'</com.izforge.izpack.panels.ShortcutPanel>',
57+
...shortcuts,
5458
'<com.jboss.devstudio.core.installer.ShortcutPanelPatch id="shortcutpatch"/>',
5559
'<com.izforge.izpack.panels.SimpleFinishPanel id="finish"/>',
5660
'</AutomatedInstallation>'

0 commit comments

Comments
 (0)