Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 351A610B13 for ; Mon, 17 Jun 2013 12:48:11 +0000 (UTC) Received: (qmail 1539 invoked by uid 500); 17 Jun 2013 12:48:11 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 1479 invoked by uid 500); 17 Jun 2013 12:48:10 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 1312 invoked by uid 99); 17 Jun 2013 12:48:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 12:48:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E82A48A5D3A; Mon, 17 Jun 2013 12:48:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhiggins@apache.org To: commits@cordova.apache.org Message-Id: <5d8540c7f8514eae9e908734527804c0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: webworks commit: [CB-3796] Call check_reqs in create script before creating project Date: Mon, 17 Jun 2013 12:48:09 +0000 (UTC) Updated Branches: refs/heads/master 7b65004ca -> 6fd732391 [CB-3796] Call check_reqs in create script before creating project Reviewed by Jeffrey Heifetz Tested by Tracy Li Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/6fd73239 Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/6fd73239 Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/6fd73239 Branch: refs/heads/master Commit: 6fd732391b10ab9496d4925c03b8b1cf29bf1ed7 Parents: 7b65004 Author: jkeshavarzi Authored: Thu Jun 13 18:38:33 2013 -0400 Committer: Bryan Higgins Committed: Mon Jun 17 08:51:19 2013 -0400 ---------------------------------------------------------------------- blackberry10/bin/create | 6 ++++++ blackberry10/bin/create.bat | 2 ++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/6fd73239/blackberry10/bin/create ---------------------------------------------------------------------- diff --git a/blackberry10/bin/create b/blackberry10/bin/create index b8b2b89..4ba2665 100755 --- a/blackberry10/bin/create +++ b/blackberry10/bin/create @@ -26,6 +26,12 @@ CURRENT_DIR=$(pwd) BIN_DIR=$(dirname "$0") +#Run check_reqs before doing anything and exit if there's an error +"$BIN_DIR"/check_reqs +if [ ${?} -ne 0 ]; then + exit 1 +fi + #Run npm install every time (even if node_modules folder is present) to cover platform upgrade cd "$BIN_DIR"/.. #Removed sudo usage so that node modules are not ownder by root http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/6fd73239/blackberry10/bin/create.bat ---------------------------------------------------------------------- diff --git a/blackberry10/bin/create.bat b/blackberry10/bin/create.bat index a8f7bab..2966f72 100644 --- a/blackberry10/bin/create.bat +++ b/blackberry10/bin/create.bat @@ -20,6 +20,8 @@ goto comment set BIN_DIR=%~dp0 +"%BIN_DIR%check_reqs" + pushd %BIN_DIR%.. call npm install popd