Browse Source

Add wildcards to .gitignore, Fix grunt file deploying after git move

Felix Schultze 9 years ago
parent
commit
5c4cdbe895
3 changed files with 8 additions and 7 deletions
  1. 2 2
      .gitignore
  2. 5 4
      Gruntfile.js
  3. 1 1
      package.json

+ 2 - 2
.gitignore

@@ -6,8 +6,8 @@ __pycache__
 # Installer logs
 pip-log.txt
 
-.swp
-.pyc
+*.swp
+*.pyc
 node_modules/
 .~*#
 settings_env.py

+ 5 - 4
Gruntfile.js

@@ -3,12 +3,13 @@ module.exports = function(grunt) {
 
     sshServer = 'ipepdvcompute3.ipe.kit.edu';
     username = 'visualization';
+	tarName = '<%= pkg.name %>.tar';
 
     deployCommand = function(env) {
         var command = 'ssh  ' + username + '@' + sshServer
                 + ' "cd /usr/local/www/;'
                 + 'rm -rf <%= pkg.name %>;'
-                + 'tar -xf <%= pkg.name %>.tar;'
+                + 'tar -xf ' + tarName + ';'
                 + 'cp -r <%= pkg.name %>/* <%= pkg.name %>-' + env + '/;"';
         return command;
     }
@@ -27,13 +28,13 @@ module.exports = function(grunt) {
 
 		shell: {
             pkg: {
-                command: 'tar -cf ../<%= pkg.name %>.tar ../<%= pkg.name %>/*  --exclude=settings_env.py --exclude=node_modules --exclude=__pycache__ --exclude=Gruntfile.js --exclude=startDev.sh --exclude=manage.py'
+                command: 'tar -cf ' + tarName + '  ../<%= pkg.name %>/*  --exclude=settings_env.py --exclude=node_modules --exclude=__pycache__ --exclude=Gruntfile.js --exclude=startDev.sh --exclude=manage.py'
             },
             rmPkg: {
-                command: 'rm ../<%= pkg.name %>.tar'
+                command: 'rm ' + tarName
             },
             scp: {
-                command: 'scp ../<%= pkg.name %>.tar visualization@ipepdvcompute3.ipe.kit.edu:/usr/local/www/'
+                command: 'scp ' + tarName + ' visualization@ipepdvcompute3.ipe.kit.edu:/usr/local/www/'
             },
             deployStaging: {
                 command: deployCommand('staging')

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "visualization",
+  "name": "volume-visualization",
   "version": "0.0.9",
   "jsname": "threeJsHelper",
   "description": "ERROR: No README.md file found!",