From d0655bbe7c30e0b417f9d82457fde0a47f9f86a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 24 Dec 2013 16:28:10 -0400 Subject: Include git-receive-pack, git-upload-pack, and git wrappers in the Linux standalone build, and OSX app, so they will be available when it's added to PATH. --- standalone/linux/README | 20 ----- standalone/linux/git-annex | 31 -------- standalone/linux/git-annex-shell | 31 -------- standalone/linux/git-annex-webapp | 31 -------- standalone/linux/runshell | 90 ---------------------- standalone/linux/skel/README | 20 +++++ standalone/linux/skel/git | 31 ++++++++ standalone/linux/skel/git-annex | 31 ++++++++ standalone/linux/skel/git-annex-shell | 31 ++++++++ standalone/linux/skel/git-annex-webapp | 31 ++++++++ standalone/linux/skel/git-receive-pack | 31 ++++++++ standalone/linux/skel/git-upload-pack | 31 ++++++++ standalone/linux/skel/runshell | 90 ++++++++++++++++++++++ standalone/osx/git-annex.app/Contents/MacOS/git | 31 ++++++++ .../git-annex.app/Contents/MacOS/git-receive-pack | 31 ++++++++ .../git-annex.app/Contents/MacOS/git-upload-pack | 31 ++++++++ 16 files changed, 389 insertions(+), 203 deletions(-) delete mode 100644 standalone/linux/README delete mode 100755 standalone/linux/git-annex delete mode 100755 standalone/linux/git-annex-shell delete mode 100755 standalone/linux/git-annex-webapp delete mode 100755 standalone/linux/runshell create mode 100644 standalone/linux/skel/README create mode 100755 standalone/linux/skel/git create mode 100755 standalone/linux/skel/git-annex create mode 100755 standalone/linux/skel/git-annex-shell create mode 100755 standalone/linux/skel/git-annex-webapp create mode 100755 standalone/linux/skel/git-receive-pack create mode 100755 standalone/linux/skel/git-upload-pack create mode 100755 standalone/linux/skel/runshell create mode 100755 standalone/osx/git-annex.app/Contents/MacOS/git create mode 100755 standalone/osx/git-annex.app/Contents/MacOS/git-receive-pack create mode 100755 standalone/osx/git-annex.app/Contents/MacOS/git-upload-pack (limited to 'standalone') diff --git a/standalone/linux/README b/standalone/linux/README deleted file mode 100644 index 2a321845f..000000000 --- a/standalone/linux/README +++ /dev/null @@ -1,20 +0,0 @@ -You can put this directory into your PATH, or symlink the programs in this -directory to anyplace already in your PATH, and use git-annex the same -as if you'd installed it using a package manager. - -Or, you can use the runshell script in this directory to start a shell -that is configured to use git-annex and the other utilities included in -this bundle, including git, gpg, rsync, ssh, etc. - -This should work on any Linux system of the appropriate architecture. -More or less. - - -How it works: This directory tree contains a lot of libraries and programs -that git-annex needs. But it's not a chroot. Instead, runshell sets a lot -of environment variables to cause files from here to be used, and a shim -around the binaries arranges for them to be run with the libraries in here. - -It shouldn't even be dependent on the host system's glibc libraries. -All that's needed is a kernel that supports the glibc included in this -bundle. diff --git a/standalone/linux/git-annex b/standalone/linux/git-annex deleted file mode 100755 index 27df466e4..000000000 --- a/standalone/linux/git-annex +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -link="$(readlink "$0")" || true -if [ -n "$link" ]; then - base="$(dirname "$link")" -else - base="$(dirname "$0")" -fi - -if [ ! -d "$base" ]; then - echo "** cannot find base directory (I seem to be $0)" >&2 - exit 1 -fi -if [ ! -e "$base/runshell" ]; then - echo "** cannot find $base/runshell" >&2 - exit 1 -fi - -# Get absolute path to base, to avoid breakage when things change directories. -orig="$(pwd)" -cd "$base" -base="$(pwd)" -cd "$orig" - -# If this is a standalone app, set a variable that git-annex can use to -# install itself. -if [ -e "$base/bin/git-annex" ]; then - GIT_ANNEX_APP_BASE="$base" - export GIT_ANNEX_APP_BASE -fi - -exec "$base/runshell" git-annex "$@" diff --git a/standalone/linux/git-annex-shell b/standalone/linux/git-annex-shell deleted file mode 100755 index a07895591..000000000 --- a/standalone/linux/git-annex-shell +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -link="$(readlink "$0")" || true -if [ -n "$link" ]; then - base="$(dirname "$link")" -else - base="$(dirname "$0")" -fi - -if [ ! -d "$base" ]; then - echo "** cannot find base directory (I seem to be $0)" >&2 - exit 1 -fi -if [ ! -e "$base/runshell" ]; then - echo "** cannot find $base/runshell" >&2 - exit 1 -fi - -# Get absolute path to base, to avoid breakage when things change directories. -orig="$(pwd)" -cd "$base" -base="$(pwd)" -cd "$orig" - -# If this is a standalone app, set a variable that git-annex can use to -# install itself. -if [ -e "$base/bin/git-annex" ]; then - GIT_ANNEX_APP_BASE="$base" - export GIT_ANNEX_APP_BASE -fi - -exec "$base/runshell" git-annex-shell "$@" diff --git a/standalone/linux/git-annex-webapp b/standalone/linux/git-annex-webapp deleted file mode 100755 index acf2a5135..000000000 --- a/standalone/linux/git-annex-webapp +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -link="$(readlink "$0")" || true -if [ -n "$link" ]; then - base="$(dirname "$link")" -else - base="$(dirname "$0")" -fi - -if [ ! -d "$base" ]; then - echo "** cannot find base directory (I seem to be $0)" >&2 - exit 1 -fi -if [ ! -e "$base/runshell" ]; then - echo "** cannot find $base/runshell" >&2 - exit 1 -fi - -# Get absolute path to base, to avoid breakage when things change directories. -orig="$(pwd)" -cd "$base" -base="$(pwd)" -cd "$orig" - -# If this is a standalone app, set a variable that git-annex can use to -# install itself. -if [ -e "$base/bin/git-annex" ]; then - GIT_ANNEX_APP_BASE="$base" - export GIT_ANNEX_APP_BASE -fi - -exec "$base/runshell" git-annex webapp "$@" diff --git a/standalone/linux/runshell b/standalone/linux/runshell deleted file mode 100755 index 4481b0d7f..000000000 --- a/standalone/linux/runshell +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Runs a shell command (or interactive shell) using the binaries and -# libraries bundled with this app. - -set -e - -base="$(dirname "$0")" - -if [ ! -d "$base" ]; then - echo "** cannot find base directory (I seem to be $0)" >&2 - exit 1 -fi - -if [ ! -e "$base/bin/git-annex" ]; then - echo "** base directory $base does not contain bin/git-annex" >&2 - exit 1 -fi -if [ ! -e "$base/bin/git" ]; then - echo "** base directory $base does not contain bin/git" >&2 - exit 1 -fi - -# Get absolute path to base, to avoid breakage when things change directories. -orig="$(pwd)" -cd "$base" -base="$(pwd)" -cd "$orig" - -# Install shim that's used to run git-annex-shell from ssh authorized_keys. -# The assistant also does this when run, but the user may not be using the -# assistant. -if [ ! -e "$HOME/.ssh/git-annex-shell" ]; then - mkdir "$HOME/.ssh" >/dev/null 2>&1 || true - ( - echo "#!/bin/sh" - echo "set -e" - echo "exec $base/runshell git-annex-shell -c \"\$SSH_ORIGINAL_COMMAND\"" - ) > "$HOME/.ssh/git-annex-shell" - chmod +x "$HOME/.ssh/git-annex-shell" -fi - -# Put our binaries first, to avoid issues with out of date or incompatable -# system binaries. -ORIG_PATH="$PATH" -export ORIG_PATH -PATH=$base/bin:$PATH -export PATH - -# This is used by the shim wrapper around each binary. -for lib in $(cat $base/libdirs); do - GIT_ANNEX_LD_LIBRARY_PATH="$base/$lib:$GIT_ANNEX_LD_LIBRARY_PATH" -done -export GIT_ANNEX_LD_LIBRARY_PATH -GIT_ANNEX_LINKER="$base/$(cat $base/linker)" -export GIT_ANNEX_LINKER -GIT_ANNEX_SHIMMED="$base/shimmed" -export GIT_ANNEX_SHIMMED - -ORIG_GCONV_PATH="$GCONV_PATH" -export ORIG_GCONV_PATH -GCONV_PATH=$base/$(cat $base/gconvdir) -export GCONV_PATH - -ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" -export ORIG_GIT_EXEC_PATH -GIT_EXEC_PATH=$base/git-core -export GIT_EXEC_PATH - -ORIG_GIT_TEMPLATE_DIR="$GIT_TEMPLATE_DIR" -export ORIG_GIT_TEMPLATE_DIR -GIT_TEMPLATE_DIR="$base/templates" -export GIT_TEMPLATE_DIR - -ORIG_MANPATH="$MANPATH" -export ORIG_MANPATH -MANPATH="$base/usr/share/man:$MANPATH" -export MANPATH - -# Indicate which variables were exported above and should be cleaned -# when running non-bundled programs. -GIT_ANNEX_STANDLONE_ENV="PATH GCONV_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR MANPATH" -export GIT_ANNEX_STANDLONE_ENV - -if [ "$1" ]; then - cmd="$1" - shift 1 - exec "$cmd" "$@" -else - sh -fi diff --git a/standalone/linux/skel/README b/standalone/linux/skel/README new file mode 100644 index 000000000..2a321845f --- /dev/null +++ b/standalone/linux/skel/README @@ -0,0 +1,20 @@ +You can put this directory into your PATH, or symlink the programs in this +directory to anyplace already in your PATH, and use git-annex the same +as if you'd installed it using a package manager. + +Or, you can use the runshell script in this directory to start a shell +that is configured to use git-annex and the other utilities included in +this bundle, including git, gpg, rsync, ssh, etc. + +This should work on any Linux system of the appropriate architecture. +More or less. + + +How it works: This directory tree contains a lot of libraries and programs +that git-annex needs. But it's not a chroot. Instead, runshell sets a lot +of environment variables to cause files from here to be used, and a shim +around the binaries arranges for them to be run with the libraries in here. + +It shouldn't even be dependent on the host system's glibc libraries. +All that's needed is a kernel that supports the glibc included in this +bundle. diff --git a/standalone/linux/skel/git b/standalone/linux/skel/git new file mode 100755 index 000000000..f32cf8193 --- /dev/null +++ b/standalone/linux/skel/git @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git "$@" diff --git a/standalone/linux/skel/git-annex b/standalone/linux/skel/git-annex new file mode 100755 index 000000000..27df466e4 --- /dev/null +++ b/standalone/linux/skel/git-annex @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-annex "$@" diff --git a/standalone/linux/skel/git-annex-shell b/standalone/linux/skel/git-annex-shell new file mode 100755 index 000000000..a07895591 --- /dev/null +++ b/standalone/linux/skel/git-annex-shell @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-annex-shell "$@" diff --git a/standalone/linux/skel/git-annex-webapp b/standalone/linux/skel/git-annex-webapp new file mode 100755 index 000000000..acf2a5135 --- /dev/null +++ b/standalone/linux/skel/git-annex-webapp @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-annex webapp "$@" diff --git a/standalone/linux/skel/git-receive-pack b/standalone/linux/skel/git-receive-pack new file mode 100755 index 000000000..32d166e84 --- /dev/null +++ b/standalone/linux/skel/git-receive-pack @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-receive-pack "$@" diff --git a/standalone/linux/skel/git-upload-pack b/standalone/linux/skel/git-upload-pack new file mode 100755 index 000000000..f05aad83e --- /dev/null +++ b/standalone/linux/skel/git-upload-pack @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-upload-pack "$@" diff --git a/standalone/linux/skel/runshell b/standalone/linux/skel/runshell new file mode 100755 index 000000000..4481b0d7f --- /dev/null +++ b/standalone/linux/skel/runshell @@ -0,0 +1,90 @@ +#!/bin/sh +# Runs a shell command (or interactive shell) using the binaries and +# libraries bundled with this app. + +set -e + +base="$(dirname "$0")" + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi + +if [ ! -e "$base/bin/git-annex" ]; then + echo "** base directory $base does not contain bin/git-annex" >&2 + exit 1 +fi +if [ ! -e "$base/bin/git" ]; then + echo "** base directory $base does not contain bin/git" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# Install shim that's used to run git-annex-shell from ssh authorized_keys. +# The assistant also does this when run, but the user may not be using the +# assistant. +if [ ! -e "$HOME/.ssh/git-annex-shell" ]; then + mkdir "$HOME/.ssh" >/dev/null 2>&1 || true + ( + echo "#!/bin/sh" + echo "set -e" + echo "exec $base/runshell git-annex-shell -c \"\$SSH_ORIGINAL_COMMAND\"" + ) > "$HOME/.ssh/git-annex-shell" + chmod +x "$HOME/.ssh/git-annex-shell" +fi + +# Put our binaries first, to avoid issues with out of date or incompatable +# system binaries. +ORIG_PATH="$PATH" +export ORIG_PATH +PATH=$base/bin:$PATH +export PATH + +# This is used by the shim wrapper around each binary. +for lib in $(cat $base/libdirs); do + GIT_ANNEX_LD_LIBRARY_PATH="$base/$lib:$GIT_ANNEX_LD_LIBRARY_PATH" +done +export GIT_ANNEX_LD_LIBRARY_PATH +GIT_ANNEX_LINKER="$base/$(cat $base/linker)" +export GIT_ANNEX_LINKER +GIT_ANNEX_SHIMMED="$base/shimmed" +export GIT_ANNEX_SHIMMED + +ORIG_GCONV_PATH="$GCONV_PATH" +export ORIG_GCONV_PATH +GCONV_PATH=$base/$(cat $base/gconvdir) +export GCONV_PATH + +ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" +export ORIG_GIT_EXEC_PATH +GIT_EXEC_PATH=$base/git-core +export GIT_EXEC_PATH + +ORIG_GIT_TEMPLATE_DIR="$GIT_TEMPLATE_DIR" +export ORIG_GIT_TEMPLATE_DIR +GIT_TEMPLATE_DIR="$base/templates" +export GIT_TEMPLATE_DIR + +ORIG_MANPATH="$MANPATH" +export ORIG_MANPATH +MANPATH="$base/usr/share/man:$MANPATH" +export MANPATH + +# Indicate which variables were exported above and should be cleaned +# when running non-bundled programs. +GIT_ANNEX_STANDLONE_ENV="PATH GCONV_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR MANPATH" +export GIT_ANNEX_STANDLONE_ENV + +if [ "$1" ]; then + cmd="$1" + shift 1 + exec "$cmd" "$@" +else + sh +fi diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git b/standalone/osx/git-annex.app/Contents/MacOS/git new file mode 100755 index 000000000..ccf2cd741 --- /dev/null +++ b/standalone/osx/git-annex.app/Contents/MacOS/git @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git "$@" diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-receive-pack b/standalone/osx/git-annex.app/Contents/MacOS/git-receive-pack new file mode 100755 index 000000000..efbbf2bb3 --- /dev/null +++ b/standalone/osx/git-annex.app/Contents/MacOS/git-receive-pack @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-receive-pack "$@" diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-upload-pack b/standalone/osx/git-annex.app/Contents/MacOS/git-upload-pack new file mode 100755 index 000000000..5049371c9 --- /dev/null +++ b/standalone/osx/git-annex.app/Contents/MacOS/git-upload-pack @@ -0,0 +1,31 @@ +#!/bin/sh +link="$(readlink "$0")" || true +if [ -n "$link" ]; then + base="$(dirname "$link")" +else + base="$(dirname "$0")" +fi + +if [ ! -d "$base" ]; then + echo "** cannot find base directory (I seem to be $0)" >&2 + exit 1 +fi +if [ ! -e "$base/runshell" ]; then + echo "** cannot find $base/runshell" >&2 + exit 1 +fi + +# Get absolute path to base, to avoid breakage when things change directories. +orig="$(pwd)" +cd "$base" +base="$(pwd)" +cd "$orig" + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/git-annex" ]; then + GIT_ANNEX_APP_BASE="$base" + export GIT_ANNEX_APP_BASE +fi + +exec "$base/runshell" git-upload-pack "$@" -- cgit v1.2.3