giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [1/3] git commit: updated refs/heads/trunk to 371f554
Date Wed, 13 Nov 2013 00:10:07 GMT
Updated Branches:
  refs/heads/trunk 4dd605a3a -> 371f554f9


GIRAPH-782. giraph script can't find GIRAPH_ENV_DIR when called via $PATH


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/371f554f
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/371f554f
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/371f554f

Branch: refs/heads/trunk
Commit: 371f554f94fc5398ef7d63fc710bd99a4ce62596
Parents: 5251864
Author: Roman Shaposhnik <rvs@apache.org>
Authored: Tue Oct 15 16:28:18 2013 -0700
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Tue Nov 12 16:09:46 2013 -0800

----------------------------------------------------------------------
 bin/giraph           | 2 +-
 bin/giraph-admin     | 2 +-
 bin/giraph-env       | 2 +-
 bin/halt-application | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/371f554f/bin/giraph
----------------------------------------------------------------------
diff --git a/bin/giraph b/bin/giraph
index bc4f5dc..e1b0fe9 100755
--- a/bin/giraph
+++ b/bin/giraph
@@ -23,7 +23,7 @@ if [ $# = 0 ]; then
 fi
 
 # locate and run the giraph-env script to populate env vars, classpath, etc.
-GIRAPH_ENV_DIR="$( cd -P "$( dirname "$0" )" && pwd )"
+GIRAPH_ENV_DIR="$( cd -P "$( dirname "${BASH_SOURCE:-0}" )" && pwd )"
 source $GIRAPH_ENV_DIR/giraph-env
 
 exec "$HADOOP_HOME/bin/hadoop" --config $HADOOP_CONF_DIR jar $JAR $CLASS $HADOOP_PROPERTIES
-libjars $GIRAPH_JARS  "$@"

http://git-wip-us.apache.org/repos/asf/giraph/blob/371f554f/bin/giraph-admin
----------------------------------------------------------------------
diff --git a/bin/giraph-admin b/bin/giraph-admin
index 827c289..1c43778 100644
--- a/bin/giraph-admin
+++ b/bin/giraph-admin
@@ -24,7 +24,7 @@ if [ $# = 0 ]; then
   exit 1
 fi
 
-GIRAPH_ENV_DIR="$( cd -P "$( dirname "$0" )" && pwd )"
+GIRAPH_ENV_DIR="$( cd -P "$( dirname "${BASH_SOURCE:-0}" )" && pwd )"
 source $GIRAPH_ENV_DIR/giraph-env
 
 # run the ZK cleaner?

http://git-wip-us.apache.org/repos/asf/giraph/blob/371f554f/bin/giraph-env
----------------------------------------------------------------------
diff --git a/bin/giraph-env b/bin/giraph-env
index 46852a6..9352d15 100644
--- a/bin/giraph-env
+++ b/bin/giraph-env
@@ -15,7 +15,7 @@
 
 
 # resolve links - $0 may be a softlink
-THIS="$0"
+THIS="${BASH_SOURCE:-0}"
 while [ -h "$THIS" ]; do
   ls=`ls -ld "$THIS"`
   link=`expr "$ls" : '.*-> \(.*\)$'`

http://git-wip-us.apache.org/repos/asf/giraph/blob/371f554f/bin/halt-application
----------------------------------------------------------------------
diff --git a/bin/halt-application b/bin/halt-application
index 0526661..e71177f 100644
--- a/bin/halt-application
+++ b/bin/halt-application
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GIRAPH_ENV_DIR="$( cd -P "$( dirname "$0" )" && pwd )"
+GIRAPH_ENV_DIR="$( cd -P "$( dirname "${BASH_SOURCE:-0}" )" && pwd )"
 source $GIRAPH_ENV_DIR/giraph-env
 
 CLASS=org.apache.giraph.zk.ZooKeeperNodeCreator


Mime
View raw message