diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 21:43:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:36 +0100 |
| commit | 3df5304ada4cec75072bc71f24ab82fe9b48d97c (patch) | |
| tree | 99dba5737b1718643a31c067a0023024cda33275 /solenv | |
| parent | 5de3b85f17d90e535f963313b4a645b28dacba33 (diff) | |
sysui: remove Package_icons
- rename main_app.ico to soffice.ico (in case the name is relevant?)
- installer: hard-code path to sysui/desktop/icons/soffice.ico
Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/shortcut.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index 421a649fb56e..c3469085c244 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -633,17 +633,17 @@ sub create_shortcut_table my $onefile = ""; my $sofficefile = "soffice.ico"; - my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0); + my $sourcepathref = $ENV{'SRCDIR'} . "/sysui/desktop/icons/" . $sofficefile; - if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); } + if (! -f $sourcepathref) { installer::exiter::exit_program("ERROR: Could not find $sofficefile ($sourcepathref) as icon!", "create_shortcut_table"); } - if (! grep {$_ eq $$sourcepathref} @{$iconfilecollector}) + if (! grep {$_ eq $sourcepathref} @{$iconfilecollector}) { - unshift(@{$iconfilecollector}, $$sourcepathref); + unshift(@{$iconfilecollector}, $sourcepathref); $installer::globals::sofficeiconadded = 1; } - my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; + my $localinfoline = "Added icon file $sourcepathref for language pack into icon file collector.\n"; push(@installer::globals::logfileinfo, $localinfoline); # Saving the file |