From 4e4adc41953fc61a19cf3f0ca487a5a1951cc1f0 Mon Sep 17 00:00:00 2001 From: Zakariyya Mughal Date: Sun, 24 Sep 2023 14:37:11 -0400 Subject: [PATCH] Fix paths used in rdf2hdtcat Should default to using the `PATH` as indicated in the documentation. --- hdt-java-cli/bin/rdf2hdtcat.sh | 5 ++--- hdt-java-package/bin/rdf2hdtcat.sh | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hdt-java-cli/bin/rdf2hdtcat.sh b/hdt-java-cli/bin/rdf2hdtcat.sh index e08beb74..04c1e0cb 100644 --- a/hdt-java-cli/bin/rdf2hdtcat.sh +++ b/hdt-java-cli/bin/rdf2hdtcat.sh @@ -18,8 +18,8 @@ function showhelp { } # Defaults -declare rdf2hdt="bin/rdf2hdt.sh" -declare hdtCat="bin/hdtCat.sh" +declare rdf2hdt="rdf2hdt.sh" +declare hdtCat="hdtCat.sh" declare input="input.rdf" declare -i lines declare output="output.hdt" @@ -91,7 +91,6 @@ for (( i=$splits; i>1; i=i/2 )); do echo "***************************************************************" echo "Merging $i hdt files: " "$input"_split_*_"$i".hdt echo "***************************************************************" - echo -n "$input"_split_*_"$i".hdt | xargs -d' ' -n2 -P$threads bash -c 'temp=${2%_*.hdt} ; bin/hdtCat.sh $1 $2 ${1%_*.hdt}_${temp#*split_}_$0.hdt' $((i/2)) command='temp=${2%_*.hdt} ; '$hdtCat' $1 $2 ${1%_*.hdt}_${temp#*split_}_$0.hdt' echo -n "$input"_split_*_"$i".hdt | xargs -d' ' -n2 -P$threads bash -c "$command" $((i/2)) done diff --git a/hdt-java-package/bin/rdf2hdtcat.sh b/hdt-java-package/bin/rdf2hdtcat.sh index e08beb74..04c1e0cb 100644 --- a/hdt-java-package/bin/rdf2hdtcat.sh +++ b/hdt-java-package/bin/rdf2hdtcat.sh @@ -18,8 +18,8 @@ function showhelp { } # Defaults -declare rdf2hdt="bin/rdf2hdt.sh" -declare hdtCat="bin/hdtCat.sh" +declare rdf2hdt="rdf2hdt.sh" +declare hdtCat="hdtCat.sh" declare input="input.rdf" declare -i lines declare output="output.hdt" @@ -91,7 +91,6 @@ for (( i=$splits; i>1; i=i/2 )); do echo "***************************************************************" echo "Merging $i hdt files: " "$input"_split_*_"$i".hdt echo "***************************************************************" - echo -n "$input"_split_*_"$i".hdt | xargs -d' ' -n2 -P$threads bash -c 'temp=${2%_*.hdt} ; bin/hdtCat.sh $1 $2 ${1%_*.hdt}_${temp#*split_}_$0.hdt' $((i/2)) command='temp=${2%_*.hdt} ; '$hdtCat' $1 $2 ${1%_*.hdt}_${temp#*split_}_$0.hdt' echo -n "$input"_split_*_"$i".hdt | xargs -d' ' -n2 -P$threads bash -c "$command" $((i/2)) done