You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/08/17 17:10:21 UTC
[42/50] [abbrv] jena git commit: JENA-1009: Add -- to filename
consuming shell commands
JENA-1009: Add -- to filename consuming shell commands
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6beee6f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6beee6f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6beee6f
Branch: refs/heads/JENA-491-construct-quads
Commit: f6beee6f9c54dc64861a671f96ab5d2e8c657dc5
Parents: 957959c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 14 16:44:42 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 14 16:44:42 2015 +0100
----------------------------------------------------------------------
apache-jena/bin/tdbloader2 | 4 ++--
apache-jena/bin/tdbloader2common | 6 +++---
apache-jena/bin/tdbloader2data | 6 +++---
apache-jena/bin/tdbloader2index | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f6beee6f/apache-jena/bin/tdbloader2
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2 b/apache-jena/bin/tdbloader2
index 530aca8..4086fd6 100755
--- a/apache-jena/bin/tdbloader2
+++ b/apache-jena/bin/tdbloader2
@@ -108,13 +108,13 @@ function resolveLink() {
# BSD style readlink behaves differently to GNU readlink
# Have to manually follow links
while [ -L "$NAME" ]; do
- NAME=$(readlink "$NAME")
+ NAME=$(readlink -- "$NAME")
done
;;
*)
# Assuming standard GNU readlink with -f for
# canonicalize
- NAME=$(readlink -f "$NAME")
+ NAME=$(readlink -f -- "$NAME")
;;
esac
fi
http://git-wip-us.apache.org/repos/asf/jena/blob/f6beee6f/apache-jena/bin/tdbloader2common
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2common b/apache-jena/bin/tdbloader2common
index b5f0dbf..807ac1d 100644
--- a/apache-jena/bin/tdbloader2common
+++ b/apache-jena/bin/tdbloader2common
@@ -135,13 +135,13 @@ function resolveLink() {
# BSD style readlink behaves differently to GNU readlink
# Have to manually follow links
while [ -L "$NAME" ]; do
- NAME=$(readlink "$NAME")
+ NAME=$(readlink -- "$NAME")
done
;;
*)
# Assuming standard GNU readlink with -f for
# canonicalize
- NAME=$(readlink -f "$NAME")
+ NAME=$(readlink -f -- "$NAME")
;;
esac
fi
@@ -193,7 +193,7 @@ function makeAbsolute() {
;;
*)
# Otherwise assume standard GNU readlink
- NAME=$(readlink -f "$NAME")
+ NAME=$(readlink -f -- "$NAME")
;;
esac
http://git-wip-us.apache.org/repos/asf/jena/blob/f6beee6f/apache-jena/bin/tdbloader2data
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2data b/apache-jena/bin/tdbloader2data
index 16a761f..ba41f00 100755
--- a/apache-jena/bin/tdbloader2data
+++ b/apache-jena/bin/tdbloader2data
@@ -27,13 +27,13 @@ function resolveLink() {
# BSD style readlink behaves differently to GNU readlink
# Have to manually follow links
while [ -L "$NAME" ]; do
- NAME=$(readlink "$NAME")
+ NAME=$(readlink -- "$NAME")
done
;;
*)
# Assuming standard GNU readlink with -f for
# canonicalize
- NAME=$(readlink -f "$NAME")
+ NAME=$(readlink -f -- "$NAME")
;;
esac
fi
@@ -284,6 +284,6 @@ debug "Triples text files is $DATA_TRIPLES"
debug "Quads text file is $DATA_QUADS"
java $JVM_ARGS -cp "$JENA_CP" "$PKG".CmdNodeTableBuilder \
- "--loc=$LOC" "--triples=$DATA_TRIPLES" "--quads=$DATA_QUADS" "${FILES[@]}"
+ "--loc=$LOC" "--triples=$DATA_TRIPLES" "--quads=$DATA_QUADS" -- "${FILES[@]}"
info "Data Load Phase Completed"
http://git-wip-us.apache.org/repos/asf/jena/blob/f6beee6f/apache-jena/bin/tdbloader2index
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2index b/apache-jena/bin/tdbloader2index
index d26072f..89296aa 100755
--- a/apache-jena/bin/tdbloader2index
+++ b/apache-jena/bin/tdbloader2index
@@ -27,13 +27,13 @@ function resolveLink() {
# BSD style readlink behaves differently to GNU readlink
# Have to manually follow links
while [ -L "$NAME" ]; do
- NAME=$(readlink "$NAME")
+ NAME=$(readlink -- "$NAME")
done
;;
*)
# Assuming standard GNU readlink with -f for
# canonicalize
- NAME=$(readlink -f "$NAME")
+ NAME=$(readlink -f -- "$NAME")
;;
esac
fi