diff --git a/gulpfile.js b/gulpfile.js index c415bc9185..78e1b6da1c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,7 +71,7 @@ require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig); // Take es6 files from angular2's output, rename to js, and move to dist/lib/ gulp.task('ng2-rename', function(done) { - exec('ls dist/angular-master', function(err) { + exec('test -e dist/angular-master', function(err) { if (err) { console.log('You have not installed angular master.\n' + 'Please run ./scripts/build/update-angular.sh.\n' + diff --git a/package.json b/package.json index de3f1b9790..c48d587327 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,9 @@ "q": "^1.2.0", "request": "^2.53.0", "serve-static": "~1.8.1", - "systemjs": "^0.11.3", + "systemjs-builder": "^0.9.1", "through2": "~0.6.3", - "yargs": "^3.6.0", - "systemjs-builder": "^0.9.1" + "yargs": "^3.6.0" }, "dependencies": { "es6-module-loader": "~0.11.0", diff --git a/scripts/build/update-angular.sh b/scripts/build/update-angular.sh index 901b6122b6..f0535ed617 100755 --- a/scripts/build/update-angular.sh +++ b/scripts/build/update-angular.sh @@ -1,14 +1,10 @@ #!/bin/sh -NG_FOLDER=angular-master +NG_FOLDER=dist/angular-master -cd $(dirname $0)/../.. +cd $(dirname $0)/../../ -cd dist -if ! [ $(ls | grep $NG_FOLDER) ]; then - echo "Cloning angular2 to dist/angular-master..." - git clone git@github.com:angular/angular $NG_FOLDER -fi +$(test -e $NG_FOLDER) || (git clone git@github.com:angular/angular $NG_FOLDER) cd $NG_FOLDER echo "Running npm install in angular2..." @@ -17,4 +13,6 @@ npm install echo "Running gulp to build source..." gulp build/transpile.js.dev.es6 -echo "-- DONE --" +echo "--" +echo "-- DONE, gulp will work now --" +echo "--"