summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/download.pm
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2010-12-17 21:07:53 +0100
committerPetr Mladek <pmladek@suse.cz>2010-12-17 21:07:53 +0100
commite3600b1d2d2b4b8353a62e9cb5f99456f23d9135 (patch)
tree79065a43783d7543ef6365e39188c7b315c8c9ca /solenv/bin/modules/installer/download.pm
parentb29399d6db60e7f7baee617267961fe7143ba9ec (diff)
more langpacks installer hacks ported for helppacks
Diffstat (limited to 'solenv/bin/modules/installer/download.pm')
-rw-r--r--solenv/bin/modules/installer/download.pm22
1 files changed, 21 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 01fe0e4691e6..e9510e97defb 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -420,6 +420,7 @@ sub get_installation_type
my $type = "";
if ( $installer::globals::languagepack ) { $type = "langpack"; }
+ elsif ( $installer::globals::helppack ) { $type = "helppack"; }
else { $type = "install"; }
return $type;
@@ -661,6 +662,25 @@ sub get_install_type
$type = $type . "-arc";
}
}
+ elsif ( $installer::globals::helppack )
+ {
+ $type = "langpack";
+
+ if ( $installer::globals::isrpmbuild )
+ {
+ $type = $type . "-rpm";
+ }
+
+ if ( $installer::globals::isdebbuild )
+ {
+ $type = $type . "-deb";
+ }
+
+ if ( $installer::globals::packageformat eq "archive" )
+ {
+ $type = $type . "-arc";
+ }
+ }
else
{
$type = "install";
@@ -1025,7 +1045,7 @@ sub put_windows_productpath_into_template
if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
- if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
+ if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
}