commit | ed8b8ebc21b9da5499eedc374a91bd155a64b4c2 | [log] [tgz] |
---|---|---|
author | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
committer | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
tree | 49b987f40f5189f11a10faf60126012c62372380 | |
parent | b9dd63c1705cf84afbe71410b2086f602a3426a6 [diff] [blame] |
svn merge -r3112:3163 https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization svn merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234 svn merge -r3209:3233 https://hyracks.googlecode.com/svn/trunk/fullstack git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3237 123451ca-8445-de46-9d55-352943316053
diff --git a/hivesterix/hivesterix-dist/src/main/resources/scripts/stopnc.sh b/hivesterix/hivesterix-dist/src/main/resources/scripts/stopnc.sh index 03ce4e7..35c4794 100644 --- a/hivesterix/hivesterix-dist/src/main/resources/scripts/stopnc.sh +++ b/hivesterix/hivesterix-dist/src/main/resources/scripts/stopnc.sh
@@ -5,6 +5,10 @@ PID=`ps -ef|grep ${USER}|grep java|grep 'Dapp.name=hyracksnc'|awk '{print $2}'` if [ "$PID" == "" ]; then + PID=`ps -ef|grep ${USER}|grep java|grep 'hyracks'|awk '{print $2}'` +fi + +if [ "$PID" == "" ]; then USERID=`id | sed 's/^uid=//;s/(.*$//'` PID=`ps -ef|grep ${USERID}|grep java|grep 'Dapp.name=hyracksnc'|awk '{print $2}'` fi