diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | standalone/linux/skel/git | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-annex | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-annex-shell | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-annex-webapp | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-receive-pack | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-shell | 2 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-upload-pack | 2 |
8 files changed, 10 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 7d1ec0b87..37e9bdf06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ git-annex (5.20140422) UNRELEASED; urgency=medium of a repository. * Add remote.$name.annex-shell configuration. Thanks, Fraser Tweedale + * Support symlinking git-annex and git-annex-shell + from the Linux standalone bundle into PATH. + Thanks, jlebar. -- Joey Hess <joeyh@debian.org> Fri, 02 May 2014 15:28:53 -0300 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 |