From da76da7f2a8afcf41876ffb0b093d5e22a545aac Mon Sep 17 00:00:00 2001
From: TheMykola <mykola@itintime.com>
Date: Thu, 6 Oct 2016 10:42:57 +0300
Subject: [PATCH 1/2] Support for Ubuntu Trusty, Debian Jessie, Ubuntu Xenial

Change-Id: Ia15bd72b79bb6af32bf9e6228e3388f6f082f3c1
---
 manifests/sdk.pp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index d0cffe0..b460eb5 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -55,16 +55,16 @@
 
   # For 64bit systems, we need to install some 32bit libraries for the SDK
   # to work.
-  if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') and $::lsbdistrelease != '14.04' {
-    ensure_packages($::osfamily ? {
-      # list 64-bit version and use latest for installation too so that the same version is applied to both
-      'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
-      'Debian' => ['ia32-libs'],
-      default  => [],
-    })
-  }
-
-  if $::lsbdistrelease == '14.04' {
-    ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
+  if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
+    if $::lsbdistcodename == 'jessie' or $::lsbmajdistrelease >= 14 {
+      ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
+    } else {
+      ensure_packages($::osfamily ? {
+        # list 64-bit version and use latest for installation too so that the same version is applied to both
+        'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
+        'Debian' => ['ia32-libs'],
+        default  => [],
+      })
+    }
   }
 }

From ad4c54060e7abeaf1886c891f36e1179ff32b2cf Mon Sep 17 00:00:00 2001
From: TheMykola <mykola@itintime.com>
Date: Thu, 6 Oct 2016 13:34:38 +0300
Subject: [PATCH 2/2] Splitting long lines

Change-Id: Ie1c921bdacabd3a1bc6820d5c5f3b26df915b5a2
---
 manifests/sdk.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index b460eb5..1738cb1 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -21,10 +21,12 @@
 
   case $::kernel {
     'Linux': {
-      $unpack_command = "/bin/tar -xvf ${android::paths::archive} --no-same-owner --no-same-permissions && chmod -R a+rx ${android::paths::sdk_home}"
+      $unpack_command = "/bin/tar -xvf ${android::paths::archive} \
+      --no-same-owner --no-same-permissions && chmod -R a+rx ${android::paths::sdk_home}"
     }
     'Darwin': {
-      $unpack_command = "/usr/bin/unzip ${android::paths::archive} && chmod -R a+rx ${android::paths::sdk_home}"
+      $unpack_command = "/usr/bin/unzip ${android::paths::archive} \
+      && chmod -R a+rx ${android::paths::sdk_home}"
     }
     default: {
       fail("Unsupported Kernel: ${::kernel} operatingsystem: ${::operatingsystem}")