You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/30 00:15:41 UTC
incubator-tinkerpop git commit: attempt to make preprocessor OSX
compatible
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/preprocessor 01e61d28e -> 3fd4b4dfa
attempt to make preprocessor OSX compatible
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3fd4b4df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3fd4b4df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3fd4b4df
Branch: refs/heads/preprocessor
Commit: 3fd4b4dfa8093d2a6173f2ba80926bb1a9282c8f
Parents: 01e61d2
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sat May 30 00:15:07 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sat May 30 00:15:07 2015 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 4 ++--
docs/preprocessor/preprocess.sh | 14 +++++++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fd4b4df/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index eb305bf..5dd21c8 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -20,9 +20,9 @@
#
TP_HOME=`pwd`
-CONSOLE_HOME=`readlink -f ${TP_HOME}/gremlin-console/target/apache-gremlin-console-*-standalone`
+CONSOLE_HOME=$1
-input=$1
+input=$2
name=`basename ${input}`
output="${TP_HOME}/target/postprocess-asciidoc/${name}"
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fd4b4df/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index a793480..14ec7c7 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -27,13 +27,21 @@ if [ ! -f bin/gremlin.sh ]; then
exit 1
fi
+function directory {
+ d1=`pwd`
+ cd $1
+ d2=`pwd`
+ cd $d1
+ echo "$d2"
+}
+
mkdir -p target/postprocess-asciidoc
rm -rf target/postprocess-asciidoc/*
mkdir target/postprocess-asciidoc/tmp
cp -R docs/{static,stylesheets} target/postprocess-asciidoc/
TP_HOME=`pwd`
-CONSOLE_HOME=`readlink -f ${TP_HOME}/gremlin-console/target/apache-gremlin-console-*-standalone`
+CONSOLE_HOME=`directory "${TP_HOME}/gremlin-console/target/apache-gremlin-console-*-standalone"`
PLUGIN_DIR="${CONSOLE_HOME}/ext"
TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -Po '(?<=<version>).*(?=</version>)')
@@ -62,7 +70,7 @@ if [ ! -z "${hadoopPluginName}" -a ! -d "${hadoopPluginDirectory}" -a ${match} -
mkdir -p "${PLUGIN_DIR}/${hadoopPluginName}/"{lib,plugin}
#cp ${hadoopPluginName}/target/*${TP_VERSION}.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
cp ${hadoopPluginName}/target/*${TP_VERSION}.jar "${PLUGIN_DIR}/${hadoopPluginName}/plugin"
- libdir=`readlink -f ${hadoopPluginName}/target/*-standalone/lib/`
+ libdir=`directory "${hadoopPluginName}/target/*-standalone/lib/"`
if [ -d "${libdir}" ]; then
#cp ${libdir}/*.jar "${PLUGIN_DIR}/${hadoopPluginName}/lib"
cp ${libdir}/*.jar "${PLUGIN_DIR}/${hadoopPluginName}/plugin"
@@ -81,7 +89,7 @@ fi
cp ${TP_HOME}/hadoop-gremlin/conf/* "${CONSOLE_HOME}/conf/"
# process *.asciidoc files
-find "${TP_HOME}/docs/src/" -name "*.asciidoc" | xargs -n1 -P0 "${TP_HOME}/docs/preprocessor/preprocess-file.sh"
+find "${TP_HOME}/docs/src/" -name "*.asciidoc" | xargs -n1 -P0 "${TP_HOME}/docs/preprocessor/preprocess-file.sh" "${CONSOLE_HOME}"
cleanup