From a88e20fd1a88d90cdff7a5aa5d228aa452dcd392 Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Tue, 26 Jul 2016 15:33:12 +0200
Subject: [PATCH 1/6] Ubuntu doesn't use ia32-libs from 14.04

---
 manifests/sdk.pp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index d0cffe0..1cf0c1c 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -55,16 +55,17 @@
 
   # 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 $::lsbdistrelease >= 14.04 { 
+      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 1a25bdd2e7ace3e9d1700fd21dfa3bcf128bd3d5 Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Wed, 27 Jul 2016 08:32:49 +0200
Subject: [PATCH 2/6] Fixed spacing and quoting issues highlighted by tests

---
 manifests/sdk.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index 1cf0c1c..00d2469 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -56,9 +56,9 @@
   # 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') {
- 	if $::lsbdistcodename == 'jessie' or $::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 $::lsbdistrelease >= 14.04 {
+      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

From 6d5fedecc5ce4fa2f85591f9d892201a06b2f98c Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Wed, 27 Jul 2016 09:16:15 +0200
Subject: [PATCH 3/6] Split unpack command over multiple lines to avoid lint
 warnings

---
 manifests/sdk.pp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index 00d2469..7869a9a 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -21,10 +21,13 @@
 
   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}")

From 89cc52849b8b017c981d465367bfe1d73f93793d Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Wed, 27 Jul 2016 09:39:21 +0200
Subject: [PATCH 4/6] Manually convert float to int

---
 manifests/sdk.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index 7869a9a..f15bd96 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -60,7 +60,8 @@
   # to work.
 
   if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
-    if $::lsbdistcodename == 'jessie' or $::lsbdistrelease >= 14.04 {
+    $lsbdistrelease_major = inline_template("<%= @lsbdistrelease.to_i %>")
+    if $::lsbdistcodename == 'jessie' or $lsbdistrelease_major >= 14 {
       ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
     } else {
       ensure_packages($::osfamily ? {

From c29adee469800bec636b9fbcf57d4976fa699a65 Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Wed, 27 Jul 2016 09:44:51 +0200
Subject: [PATCH 5/6] Replaced double quotes with single quotes

---
 manifests/sdk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index f15bd96..32c4b1c 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -60,7 +60,7 @@
   # to work.
 
   if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
-    $lsbdistrelease_major = inline_template("<%= @lsbdistrelease.to_i %>")
+    $lsbdistrelease_major = inline_template('<%= @lsbdistrelease.to_i %>')
     if $::lsbdistcodename == 'jessie' or $lsbdistrelease_major >= 14 {
       ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
     } else {

From a7e207720aca8254093cf241ba1121d0f2912dd2 Mon Sep 17 00:00:00 2001
From: Craig Balfour <craig@cs.uct.ac.za>
Date: Wed, 27 Jul 2016 12:03:15 +0200
Subject: [PATCH 6/6] Convert string to integer

---
 manifests/sdk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index 32c4b1c..cfa83cb 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -60,7 +60,7 @@
   # to work.
 
   if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
-    $lsbdistrelease_major = inline_template('<%= @lsbdistrelease.to_i %>')
+    $lsbdistrelease_major = inline_template('<%= @lsbdistrelease.to_i %>') + 0
     if $::lsbdistcodename == 'jessie' or $lsbdistrelease_major >= 14 {
       ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
     } else {