You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ji...@apache.org on 2016/10/11 07:51:10 UTC
incubator-eagle git commit: EAGLE-610 fix grunt code
Repository: incubator-eagle
Updated Branches:
refs/heads/master 6f9fb4eed -> 97978c60d
EAGLE-610 fix grunt code
pass grunt code into maven build
Author: zombieJ <sm...@gmail.com>
Closes #491 from zombieJ/EAGLE-610.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/97978c60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/97978c60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/97978c60
Branch: refs/heads/master
Commit: 97978c60d5feebf47ff214db310e7816f2dea52e
Parents: 6f9fb4e
Author: zombieJ <sm...@gmail.com>
Authored: Tue Oct 11 15:50:55 2016 +0800
Committer: zombieJ <sm...@gmail.com>
Committed: Tue Oct 11 15:50:55 2016 +0800
----------------------------------------------------------------------
eagle-server/src/main/webapp/app/build/index.js | 7 ++++---
.../main/webapp/app/dev/public/js/components/sortTable.js | 2 +-
eagle-server/ui-build.sh | 9 +++++++--
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97978c60/eagle-server/src/main/webapp/app/build/index.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/build/index.js b/eagle-server/src/main/webapp/app/build/index.js
index bacbf53..2d274be 100644
--- a/eagle-server/src/main/webapp/app/build/index.js
+++ b/eagle-server/src/main/webapp/app/build/index.js
@@ -135,9 +135,10 @@
grunt.stdout.pipe(process.stdout);
grunt.stderr.pipe(process.stdout);
- grunt.on('exit', function() {
- process.exit()
- })
+ grunt.on('exit', function(code) {
+ console.log("Grunt Exit Code:", code);
+ process.exit(code)
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97978c60/eagle-server/src/main/webapp/app/dev/public/js/components/sortTable.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/components/sortTable.js b/eagle-server/src/main/webapp/app/dev/public/js/components/sortTable.js
index 599d0eb..a1e91df 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/components/sortTable.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/components/sortTable.js
@@ -132,7 +132,7 @@
$scope.$watch($attrs.sortTable + ".___SORT_TABLE___", function () {
var fullList = $scope.$parent[$attrs.sortTable];
if(fullList && !fullList.___SORT_TABLE___) {
- fullList.___SORT_TABLE___ = +new Date;
+ fullList.___SORT_TABLE___ = +new Date();
cacheFilteredList = null;
}
});
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97978c60/eagle-server/ui-build.sh
----------------------------------------------------------------------
diff --git a/eagle-server/ui-build.sh b/eagle-server/ui-build.sh
index 928df1f..d217055 100644
--- a/eagle-server/ui-build.sh
+++ b/eagle-server/ui-build.sh
@@ -36,8 +36,13 @@ cd src/main/webapp/app
echo "npm install..."
npm install
-# grunt build
echo "building..."
npm run build
+STATUS=$?
-echo "=============== Finished ==============="
\ No newline at end of file
+if [ $STATUS -eq 0 ]; then
+ echo "=============== Finished ==============="
+else
+ echo "=============== Failed ==============="
+ exit 1
+fi
\ No newline at end of file