Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8534A200B5F for ; Tue, 5 Jul 2016 12:26:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 844D8160A7C; Tue, 5 Jul 2016 10:26:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9DC78160A7D for ; Tue, 5 Jul 2016 12:26:50 +0200 (CEST) Received: (qmail 12810 invoked by uid 500); 5 Jul 2016 10:26:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 12279 invoked by uid 99); 5 Jul 2016 10:26:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 10:26:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CF4FE07F6; Tue, 5 Jul 2016 10:26:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Tue, 05 Jul 2016 10:27:04 -0000 Message-Id: <52408e68318045a3b88683770787d8c1@git.apache.org> In-Reply-To: <0093cf9e210b4de79c16e0e26a66cc42@git.apache.org> References: <0093cf9e210b4de79c16e0e26a66cc42@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/21] ignite git commit: IGNITE-3184: Hadoop: fixed Windows setenv.bat. archived-at: Tue, 05 Jul 2016 10:26:51 -0000 IGNITE-3184: Hadoop: fixed Windows setenv.bat. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68144107 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68144107 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68144107 Branch: refs/heads/master Commit: 68144107607585a92249cc174160af6839778f46 Parents: b5e6a70 Author: vozerov-gridgain Authored: Thu Jun 30 16:15:15 2016 +0300 Committer: vozerov-gridgain Committed: Thu Jun 30 16:16:39 2016 +0300 ---------------------------------------------------------------------- bin/include/setenv.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/68144107/bin/include/setenv.bat ---------------------------------------------------------------------- diff --git a/bin/include/setenv.bat b/bin/include/setenv.bat index dec1ee5..9d55521 100644 --- a/bin/include/setenv.bat +++ b/bin/include/setenv.bat @@ -47,9 +47,9 @@ if exist %IGNITE_HOME%\libs\ignite-hadoop set HADOOP_EDITION=1 if defined USER_LIBS set IGNITE_LIBS=%USER_LIBS%;%IGNITE_LIBS% -FOR /F "delims=" %%i IN ('%JAVA_HOME%\bin\java.exe -cp %IGNITE_HOME%\libs\ignite-hadoop\* org.apache.ignite.internal.processors.hadoop.HadoopClasspathMain ";"' ) DO set IGNITE_HADOOP_CLASSPATH=%%i +if "%HADOOP_EDITION%" == "1" FOR /F "delims=" %%i IN ('%JAVA_HOME%\bin\java.exe -cp %IGNITE_HOME%\libs\ignite-hadoop\* org.apache.ignite.internal.processors.hadoop.HadoopClasspathMain ";"' ) DO set IGNITE_HADOOP_CLASSPATH=%%i -if "[%IGNITE_HADOOP_CLASSPATH%]" == "[]" exit 1 +if "%IGNITE_HADOOP_CLASSPATH%" == "" goto :eof set IGNITE_LIBS=%IGNITE_LIBS%;%IGNITE_HADOOP_CLASSPATH%