From 82de2fdb249acccbc910237bbee350ec664cc142 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 16 May 2014 16:22:50 -0400
Subject: Support symlinking git-annex and git-annex-shell from the Linux
 standalone bundle into PATH.

Unless busybox doesn't support readlink -f, then it just uses readlink and
symlinking won't work. Also, OSX has no readlink -f so not done there.

Thanks, jlebar.
---
 standalone/linux/skel/git              | 2 +-
 standalone/linux/skel/git-annex        | 2 +-
 standalone/linux/skel/git-annex-shell  | 2 +-
 standalone/linux/skel/git-annex-webapp | 2 +-
 standalone/linux/skel/git-receive-pack | 2 +-
 standalone/linux/skel/git-shell        | 2 +-
 standalone/linux/skel/git-upload-pack  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'standalone/linux')

diff --git a/standalone/linux/skel/git b/standalone/linux/skel/git
index f32cf8193..7fbf82715 100755
--- a/standalone/linux/skel/git
+++ b/standalone/linux/skel/git
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-annex b/standalone/linux/skel/git-annex
index 27df466e4..7fc864d87 100755
--- a/standalone/linux/skel/git-annex
+++ b/standalone/linux/skel/git-annex
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-annex-shell b/standalone/linux/skel/git-annex-shell
index a07895591..37dbca049 100755
--- a/standalone/linux/skel/git-annex-shell
+++ b/standalone/linux/skel/git-annex-shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-annex-webapp b/standalone/linux/skel/git-annex-webapp
index acf2a5135..24a533969 100755
--- a/standalone/linux/skel/git-annex-webapp
+++ b/standalone/linux/skel/git-annex-webapp
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-receive-pack b/standalone/linux/skel/git-receive-pack
index 32d166e84..718541786 100755
--- a/standalone/linux/skel/git-receive-pack
+++ b/standalone/linux/skel/git-receive-pack
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-shell b/standalone/linux/skel/git-shell
index e3cef0f67..20c184bdf 100755
--- a/standalone/linux/skel/git-shell
+++ b/standalone/linux/skel/git-shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
diff --git a/standalone/linux/skel/git-upload-pack b/standalone/linux/skel/git-upload-pack
index f05aad83e..1df3f3f6c 100755
--- a/standalone/linux/skel/git-upload-pack
+++ b/standalone/linux/skel/git-upload-pack
@@ -1,5 +1,5 @@
 #!/bin/sh
-link="$(readlink "$0")" || true
+link="$(readlink -f "$0" 2>/dev/null || readlink "$0")" || true
 if [ -n "$link" ]; then
 	base="$(dirname "$link")"
 else
-- 
cgit v1.2.3