[Libreoffice-commits] core.git: scp2/source solenv/bin

[Markus Mohrhard]

 scp2/source/ooo/common_brand.scp            |    9 +++++++++
 solenv/bin/modules/installer/scriptitems.pm |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit ad21f8ec355dd356bdfe72c67ebf3c4c5cf3f235
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 21 03:10:33 2017 +0200

    updater: also write channel to version.ini outside of instdir
    
    Change-Id: Ibb087fc9cd17e50accf78f805e0fec4f202334b1

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e39a65e19ef1..1eef7833f2d0 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -565,6 +565,15 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
   #endif
 End
 
+ProfileItem gid_Brand_Profileitem_Version_UpdateChannel
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 19;
+    Key = "UpdateChannel";
+    Value = "<updatechannel>";
+End
+
 ProfileItem gid_Brand_Profileitem_Version_Updateid
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 58ca3fe7c5af..98b41f7b484a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -656,6 +656,26 @@ sub replace_setup_variables
     my $updateid = $productname . "_" . $libo_version_major . "_" . $$languagestringref;
     $updateid =~ s/ /_/g;
 
+    my $updatechannel = "";
+    if ( $ENV{'UPDATE_CONFIG'} && $ENV{'UPDATE_CONFIG'} ne "")
+    {
+        open(CONFIG, $ENV{'UPDATE_CONFIG'});
+        while (<CONFIG>)
+        {
+            chomp;
+            if (/^s*(\S+)=(\S+)$/)
+            {
+                $key = $1;
+                $val = $2;
+                if ($key eq "channel")
+                {
+                    $updatechannel = $val;
+                }
+            }
+        }
+        close(CONFIG);
+    }
+
     for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
     {
         my $oneitem = ${$itemsarrayref}[$i];
@@ -669,6 +689,7 @@ sub replace_setup_variables
         $value =~ s/\<alllanguages\>/$languagesstring/;
         $value =~ s/\<sourceid\>/$installer::globals::build/;
         $value =~ s/\<updateid\>/$updateid/;
+        $value =~ s/\<updatechannel\>/$updatechannel/;
         $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
         $ENV{'OOO_VENDOR'} = "" if !defined $ENV{'OOO_VENDOR'};
         $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;