From 30fcf882ec2fcbeefec2229393f5ca453d922d05 Mon Sep 17 00:00:00 2001 From: joewitt Date: Wed, 13 May 2015 22:30:50 -0400 Subject: [PATCH 1/2] Updated main index for feature highlights --- nifi-site/src/pages/html/index.hbs | 179 ++++------------------------- 1 file changed, 22 insertions(+), 157 deletions(-) diff --git a/nifi-site/src/pages/html/index.hbs b/nifi-site/src/pages/html/index.hbs index d01e8bca70..8ee8208f76 100644 --- a/nifi-site/src/pages/html/index.hbs +++ b/nifi-site/src/pages/html/index.hbs @@ -42,169 +42,34 @@ title: Apache NiFi of the high-level capabilities and objectives of Apache NiFi include:

- \ No newline at end of file From 483958ba0fb74d6ca0a3bf1b0e1ccbd1ab8af1b0 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Thu, 14 May 2015 08:07:32 -0400 Subject: [PATCH 2/2] NIFI-592: - Updating readme. - Allowing SVN username/password to be optional if configured. --- nifi-site/Gruntfile.js | 23 +++++++++++++---------- nifi-site/README.md | 3 ++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js index 782f5e4853..bead8b6bb2 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 .'; } } }, diff --git a/nifi-site/README.md b/nifi-site/README.md index 3ba231b415..4b7906b25f 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