Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-592: 

- Updating readme.
- Allowing SVN username/password to be optional if configured.
This commit is contained in:
Matt Gilman 2015-05-14 08:07:32 -04:00
parent 30fcf882ec
commit 483958ba0f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nifi-site/Gruntfile.js
View File

@ -129,7 +129,7 @@ module.exports = function (grunt) {
questions: [{ questions: [{
config: 'config.svn.username', config: 'config.svn.username',
type: 'input', 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', config: 'config.svn.password',
type: 'password', type: 'password',
message: 'SVN password:' message: 'SVN password (if different from configured):'
}], }],
then: function () { then: function () {
grunt.task.run('exec:commit'); grunt.task.run('exec:commit');
@ -185,11 +185,11 @@ module.exports = function (grunt) {
command: function() { command: function() {
var url = grunt.config('config.svn.url'); var url = grunt.config('config.svn.url');
var username = grunt.config('config.svn.username'); var username = grunt.config('config.svn.username');
if (username === '') { var command = 'svn checkout';
return 'svn checkout ' + url + ' --trust-server-cert --non-interactive dist'; if (username !== '') {
} else { command += (' --username ' + username);
return 'svn checkout --username ' + username + ' ' + url + ' --trust-server-cert --non-interactive dist';
} }
return command + ' ' + url + ' --trust-server-cert --non-interactive dist';
}, },
stdout: true, stdout: true,
stderr: true stderr: true
@ -212,11 +212,14 @@ module.exports = function (grunt) {
var username = grunt.config('config.svn.username'); var username = grunt.config('config.svn.username');
var password = grunt.config('config.svn.password'); var password = grunt.config('config.svn.password');
var message = grunt.config('config.svn.commit.message'); var message = grunt.config('config.svn.commit.message');
if (username === '') { var command = 'svn commit';
return 'svn commit --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .'; if (username !== '') {
} else { command += (' --username ' + username);
return 'svn commit --username ' + username + ' --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .';
} }
if (password !== '') {
command += (' --password ' + password);
}
return command + ' -m "' + message + '" --trust-server-cert --non-interactive .';
} }
} }
}, },

3
nifi-site/README.md
View File

@ -46,7 +46,8 @@ npm install
The site is built using [foundation][] a responsive front end framework. The site is built using [foundation][] a responsive front end framework.
Consequently, the site is using [sass][] and [compass][] for CSS pre-processing. 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 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 ```bash
gem install compass gem install compass