diff --git a/.gitignore b/.gitignore index 92b2a68..d9791e6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ screenshot_err.png snapshots chromedriver.log sauce_connect.log* +build* diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3fab2a1..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "node_modules/alfred"] - path = node_modules/alfred - url = git://github.com/sergeyksv/alfred.git diff --git a/compile.sh b/compile.sh index bf8e1ac..9d5dcb0 100755 --- a/compile.sh +++ b/compile.sh @@ -1,7 +1,10 @@ #! /bin/sh npm install -BUILD_FOLDER="build_$(date +%m%d_%H%M)" +#BUILD_FOLDER="build_$(date +%m%d_%H%M)" +BUILD_FOLDER="build" + +rm -rf #BUILD_FOLDER mkdir $BUILD_FOLDER @@ -31,7 +34,7 @@ cd $BUILD_FOLDER mv grun.js Gruntfile.js -grunt +../node_modules/.bin/grunt rm Gruntfile.js rm compile.sh diff --git a/grun.js b/grun.js index fde2e46..c0b82e3 100644 --- a/grun.js +++ b/grun.js @@ -238,5 +238,5 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-smushit'); grunt.loadNpmTasks('grunt-pngmin'); - grunt.registerTask('default', ['requirejs','buildapp','uglify','cutmustache','htmlcompressor','smushit', 'pngmin']); + grunt.registerTask('default', ['requirejs','buildapp','uglify','cutmustache','htmlcompressor','smushit']); } diff --git a/package.json b/package.json index 4d38d6e..74f64e5 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ , "grunt-smushit" : "0.4.x" } , "scripts": { - "test":"node test" + "test":"./test.sh", + "build":"./compile.sh" } } diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..b17ede8 --- /dev/null +++ b/test.sh @@ -0,0 +1,4 @@ +#! /bin/sh +./compile.sh +cd build +node test \ No newline at end of file