JENA-977: Make sh-legal; remove dev echo line
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e03018f7 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e03018f7 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e03018f7 Branch: refs/heads/master Commit: e03018f7155a9417bb1fe57bf6d546e61aaa5529 Parents: 9c6da26 Author: Andy Seaborne <[email protected]> Authored: Thu Jul 23 13:24:15 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu Jul 23 13:25:30 2015 +0100 ---------------------------------------------------------------------- apache-jena/template.bin | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/e03018f7/apache-jena/template.bin ---------------------------------------------------------------------- diff --git a/apache-jena/template.bin b/apache-jena/template.bin index bbc91fb..30eb29a 100644 --- a/apache-jena/template.bin +++ b/apache-jena/template.bin @@ -1,7 +1,7 @@ #!/bin/sh ## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -function resolveLink() { +resolveLink() { local NAME=$1 if [ -L "$NAME" ]; then @@ -26,7 +26,6 @@ function resolveLink() { # If JENA_HOME is empty if [ -z "$JENA_HOME" ]; then - echo "JENA_HOME not set, attempting to locate JENA_HOME automatically" SCRIPT="$0" # Catch common issue: script has been symlinked if [ -L "$SCRIPT" ]; then @@ -46,8 +45,8 @@ if [ -z "$JENA_HOME" ]; then # Work out root from script location JENA_HOME="$( cd "$( dirname "$SCRIPT" )/.." && pwd )" export JENA_HOME - echo "Located JENA_HOME at ${JENA_HOME}" fi + # If JENA_HOME is a symbolic link need to resolve if [ -L "${JENA_HOME}" ]; then JENA_HOME=$(resolveLink "$JENA_HOME") @@ -62,7 +61,6 @@ if [ -L "${JENA_HOME}" ]; then ;; esac export JENA_HOME - echo "Resolved symbolic links for JENA_HOME to $JENA_HOME" fi # ---- Setup
