Repository: incubator-nifi Updated Branches: refs/heads/develop 30fcf882e -> 483958ba0
NIFI-592: - Updating readme. - Allowing SVN username/password to be optional if configured. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/483958ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/483958ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/483958ba Branch: refs/heads/develop Commit: 483958ba0fb74d6ca0a3bf1b0e1ccbd1ab8af1b0 Parents: 30fcf88 Author: Matt Gilman <[email protected]> Authored: Thu May 14 08:07:32 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu May 14 08:07:32 2015 -0400 ---------------------------------------------------------------------- nifi-site/Gruntfile.js | 23 +++++++++++++---------- nifi-site/README.md | 3 ++- 2 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/483958ba/nifi-site/Gruntfile.js ---------------------------------------------------------------------- diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js index 782f5e4..bead8b6 100644 --- a/nifi-site/Gruntfile.js +++ b/nifi-site/Gruntfile.js @@ -129,7 +129,7 @@ module.exports = function (grunt) { questions: [{ config: 'config.svn.username', type: 'input', - message: 'Enter SVN username if different from current user:' + message: 'Enter SVN username (if different from current or configured user):' }] } }, @@ -160,7 +160,7 @@ module.exports = function (grunt) { }, { config: 'config.svn.password', type: 'password', - message: 'SVN password:' + message: 'SVN password (if different from configured):' }], then: function () { grunt.task.run('exec:commit'); @@ -185,11 +185,11 @@ module.exports = function (grunt) { command: function() { var url = grunt.config('config.svn.url'); var username = grunt.config('config.svn.username'); - if (username === '') { - return 'svn checkout ' + url + ' --trust-server-cert --non-interactive dist'; - } else { - return 'svn checkout --username ' + username + ' ' + url + ' --trust-server-cert --non-interactive dist'; + var command = 'svn checkout'; + if (username !== '') { + command += (' --username ' + username); } + return command + ' ' + url + ' --trust-server-cert --non-interactive dist'; }, stdout: true, stderr: true @@ -212,11 +212,14 @@ module.exports = function (grunt) { var username = grunt.config('config.svn.username'); var password = grunt.config('config.svn.password'); var message = grunt.config('config.svn.commit.message'); - if (username === '') { - return 'svn commit --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .'; - } else { - return 'svn commit --username ' + username + ' --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .'; + var command = 'svn commit'; + if (username !== '') { + command += (' --username ' + username); } + if (password !== '') { + command += (' --password ' + password); + } + return command + ' -m "' + message + '" --trust-server-cert --non-interactive .'; } } }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/483958ba/nifi-site/README.md ---------------------------------------------------------------------- diff --git a/nifi-site/README.md b/nifi-site/README.md index 3ba231b..4b7906b 100644 --- a/nifi-site/README.md +++ b/nifi-site/README.md @@ -46,7 +46,8 @@ npm install The site is built using [foundation][] a responsive front end framework. Consequently, the site is using [sass][] and [compass][] for CSS pre-processing. This will also require ruby to be installed along with sass and compass. Both -sass and compass can be installed via ruby once it is installed. +sass and compass can be installed via ruby once it is installed. In order to run +gem install ruby-devel might also need to be installed. ```bash gem install compass
