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 E1988200C65 for ; Sat, 25 Mar 2017 01:12:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E058E160BA2; Sat, 25 Mar 2017 00:12:44 +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 9423E160BAE for ; Sat, 25 Mar 2017 01:12:43 +0100 (CET) Received: (qmail 63046 invoked by uid 500); 25 Mar 2017 00:12:42 -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 62051 invoked by uid 99); 25 Mar 2017 00:12:42 -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; Sat, 25 Mar 2017 00:12:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22180E00FF; Sat, 25 Mar 2017 00:12:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Sat, 25 Mar 2017 00:13:04 -0000 Message-Id: <2083b9f5d1934d3493a47a127fe3d428@git.apache.org> In-Reply-To: <01fc728b6d18408881d1770939957f90@git.apache.org> References: <01fc728b6d18408881d1770939957f90@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/56] [abbrv] ignite git commit: IGNITE-4002: Fixed warning messages during ODBC driver installiation. archived-at: Sat, 25 Mar 2017 00:12:45 -0000 IGNITE-4002: Fixed warning messages during ODBC driver installiation. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67bd32c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67bd32c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67bd32c2 Branch: refs/heads/ignite-1192 Commit: 67bd32c207b2334984fcbc47b20d8c52002a3e2a Parents: 15c9780 Author: Igor Sapego Authored: Mon Mar 20 15:55:15 2017 +0300 Committer: Igor Sapego Committed: Mon Mar 20 15:55:15 2017 +0300 ---------------------------------------------------------------------- modules/platforms/cpp/odbc/install/install_amd64.cmd | 10 ++++++++-- modules/platforms/cpp/odbc/install/install_x86.cmd | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/67bd32c2/modules/platforms/cpp/odbc/install/install_amd64.cmd ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/install/install_amd64.cmd b/modules/platforms/cpp/odbc/install/install_amd64.cmd index 3b4b63f..2a2fff6 100644 --- a/modules/platforms/cpp/odbc/install/install_amd64.cmd +++ b/modules/platforms/cpp/odbc/install/install_amd64.cmd @@ -7,7 +7,9 @@ if [%ODBC_AMD64%] == [] ( echo error: 64-bit driver is not specified. Call format: install_amd64 abs_path_to_64_bit_driver [abs_path_to_32_bit_driver] pause exit /b 1 -) else if exist %ODBC_AMD64% ( +) + +if exist %ODBC_AMD64% ( if exist %ODBC_AMD64%\ ( echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead. ) @@ -26,7 +28,11 @@ if [%ODBC_AMD64%] == [] ( if [%ODBC_X86%] == [] ( echo warning: 32-bit driver is not specified. If you want to install 32-bit driver please specify path to it as a second argument. -) else if exist %ODBC_X86% ( + pause + exit /b 1 +) + +if exist %ODBC_X86% ( if exist %ODBC_X86%\ ( echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead. ) http://git-wip-us.apache.org/repos/asf/ignite/blob/67bd32c2/modules/platforms/cpp/odbc/install/install_x86.cmd ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/install/install_x86.cmd b/modules/platforms/cpp/odbc/install/install_x86.cmd index 93ced4b..911dbdf 100644 --- a/modules/platforms/cpp/odbc/install/install_x86.cmd +++ b/modules/platforms/cpp/odbc/install/install_x86.cmd @@ -5,7 +5,10 @@ set ODBC=%1 if [%ODBC%] == [] ( echo error: driver is not specified. Call format: install_x86 abs_path_to_driver. pause -) else if exist %ODBC% ( + exit /b 1 +) + +if exist %ODBC% ( if exist %ODBC%\ ( echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead. ) @@ -19,4 +22,5 @@ if [%ODBC%] == [] ( echo Driver can not be found: %ODBC% echo Call format: install_x86 abs_path_to_driver pause + exit /b 1 )