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 CD47710EB5 for ; Tue, 12 Nov 2013 23:26:46 +0000 (UTC) Received: (qmail 95077 invoked by uid 500); 12 Nov 2013 23:26:46 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 95057 invoked by uid 500); 12 Nov 2013 23:26:46 -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 95049 invoked by uid 99); 12 Nov 2013 23:26:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 23:26:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 86F70823B02; Tue, 12 Nov 2013 23:26:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Message-Id: <1f6a20d94f0b47e2a9d6a5f1f2758f60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: CB-5234: fixed ffos update script Date: Tue, 12 Nov 2013 23:26:46 +0000 (UTC) Updated Branches: refs/heads/3.2.x ed3879875 -> d7b8b6a99 CB-5234: fixed ffos update script Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/d7b8b6a9 Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/d7b8b6a9 Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/d7b8b6a9 Branch: refs/heads/3.2.x Commit: d7b8b6a99332146e163d41767104bc3969213e25 Parents: ed38798 Author: Steven Gill Authored: Tue Nov 12 15:23:27 2013 -0800 Committer: Steven Gill Committed: Tue Nov 12 15:26:09 2013 -0800 ---------------------------------------------------------------------- bin/lib/update.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/d7b8b6a9/bin/lib/update.js ---------------------------------------------------------------------- diff --git a/bin/lib/update.js b/bin/lib/update.js index 31c92b0..8f674a1 100755 --- a/bin/lib/update.js +++ b/bin/lib/update.js @@ -22,7 +22,7 @@ var shell = require('shelljs'), path = require('path'), fs = require('fs'), - ROOT = path.join(__dirname, '..', '..'); + ROOT = path.join(__dirname, '..', '..'); function setShellFatal(value, func) { var oldVal = shell.config.fatal; @@ -36,22 +36,19 @@ function copyJs(projectPath) { } function copyScripts(projectPath) { - var srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'scripts', 'cordova'); + var srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'project', 'cordova'); var destScriptsDir = path.join(projectPath, 'cordova'); // Delete old scripts directory. shell.rm('-rf', destScriptsDir); // Copy in the new ones. shell.cp('-r', srcScriptsDir, projectPath); - /* - shell.cp(path.join(ROOT, 'bin', 'check_reqs'), path.join(destScriptsDir, 'check_reqs')); // Make sure they are executable. shell.find(destScriptsDir).forEach(function(entry) { shell.chmod(755, entry); - });*/ + }); } exports.updateProject = function(projectPath) { - console.log("ROOT: " + ROOT); var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim(); setShellFatal(true, function() { copyJs(projectPath);