From d286e4310e31e01dc095f3d337ff50a7db56ab08 Mon Sep 17 00:00:00 2001
From: Iliyan Peychev <iliyan.peychev@liferay.com>
Date: Tue, 7 Jul 2015 14:03:16 +0200
Subject: [PATCH] LPS-56906 Fix NodeJS downloading process

When checking shall we download 32 or 64 bit Node,
we will use "sun.arch.data.model" property instead "arch"
---
 build-common-node.xml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/build-common-node.xml b/build-common-node.xml
index 9261270a982a..cf5202834f2f 100644
--- a/build-common-node.xml
+++ b/build-common-node.xml
@@ -5,36 +5,54 @@
 	<macrodef name="download-node">
 		<sequential>
 			<if>
-				<os arch="x86_32" family="mac" />
+				<and>
+					<os family="mac" />
+					<equals arg1="${sun.arch.data.model}" arg2="32" />
+				</and>
 				<then>
 					<propertycopy from="nodejs.url[osx32]" name="nodejs.url" />
 				</then>
 				<elseif>
-					<os arch="x86_64" family="mac" />
+					<and>
+						<os family="mac" />
+						<equals arg1="${sun.arch.data.model}" arg2="64" />
+					</and>
 					<then>
 						<propertycopy from="nodejs.url[osx64]" name="nodejs.url" />
 					</then>
 				</elseif>
 				<elseif>
-					<os arch="amd" family="unix" />
+					<and>
+						<os family="unix" />
+						<equals arg1="${sun.arch.data.model}" arg2="32" />
+					</and>
 					<then>
 						<propertycopy from="nodejs.url[linux32]" name="nodejs.url" />
 					</then>
 				</elseif>
 				<elseif>
-					<os arch="amd64" family="unix" />
+					<and>
+						<os family="unix" />
+						<equals arg1="${sun.arch.data.model}" arg2="64" />
+					</and>
 					<then>
 						<propertycopy from="nodejs.url[linux64]" name="nodejs.url" />
 					</then>
 				</elseif>
 				<elseif>
-					<os arch="x86" family="windows" />
+					<and>
+						<os family="windows" />
+						<equals arg1="${sun.arch.data.model}" arg2="32" />
+					</and>
 					<then>
 						<propertycopy from="nodejs.url[windows32]" name="nodejs.url" />
 					</then>
 				</elseif>
 				<elseif>
-					<os arch="amd64" family="windows" />
+					<and>
+						<os family="windows" />
+						<equals arg1="${sun.arch.data.model}" arg2="64" />
+					</and>
 					<then>
 						<propertycopy from="nodejs.url[windows64]" name="nodejs.url" />
 					</then>