Skip to content
This repository has been archived by the owner on Jan 21, 2023. It is now read-only.

Commit

Permalink
updated conditionals for ftp deploy tasks
Browse files Browse the repository at this point in the history
updated ignore files
  • Loading branch information
larsonjj committed Nov 6, 2013
1 parent 0ac0fea commit 42d194d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
@@ -1 +1 @@
* text=auto
* text=auto
6 changes: 4 additions & 2 deletions .gitignore
@@ -1,3 +1,5 @@
node_modules/
temp/
node_modules
*.log
server
dist
.ftppass
13 changes: 6 additions & 7 deletions app/templates/Gruntfile.js
Expand Up @@ -335,8 +335,7 @@ module.exports = function (grunt) {
cwd: '<%%= yeoman.dist %>/',
src: ['*/**', '*.{txt,html}', '!**/*.zip', '!**/*.psd', '!**/.git/']
}
},
// don't keep passwords in source control
},<% if (useFTP) { %>
'ftp-deploy': {
build: {
auth: {
Expand All @@ -349,7 +348,7 @@ module.exports = function (grunt) {
exclusions: ['*.svn', '.svn/', '.svn', '*.git', '.git/', '.git'],
server_sep: '/'
}
},
},<% } %>
uglify: {
dist: {
options: {
Expand Down Expand Up @@ -436,7 +435,7 @@ module.exports = function (grunt) {
ext: '.css'
}
}<% } %>
});
});<% if (useFTP) { %>

grunt.registerTask('ftpinfo', 'Grab FTP info for deployment; If valid, then deploy to FTP server', function () {
var ftpJSON = grunt.file.readJSON('.ftppass');
Expand All @@ -447,7 +446,7 @@ module.exports = function (grunt) {
grunt.config.set('secret', ftpJSON);
grunt.task.run(['ftp-deploy']);
}
});
});<% } %>

grunt.registerTask('server', 'Open a developement server within your browser', [
'clean:server',
Expand Down Expand Up @@ -483,11 +482,11 @@ module.exports = function (grunt) {
grunt.registerTask('zip', 'Build a production ready version of your site and zip it up', [
'build',
'compress'
]);
]);<% if (useFTP) { %>

grunt.registerTask('deploy', 'Build a production ready version of your site and deploy it to a desired FTP server.', [
'zip',
'ftpinfo',
]);
]);<% } %>

};
2 changes: 1 addition & 1 deletion app/templates/svnignore
@@ -1,4 +1,4 @@
node_modules
node_modules/
*.log
server/
dist/
Expand Down

0 comments on commit 42d194d

Please sign in to comment.