summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-20 13:40:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-20 13:40:57 -0400
commit9ae1750c68ca5645e60631c66d70ad561c0f9eca (patch)
tree960ce339ff72e4e0c1a9e2a56a0fdd75ab1c9458
parent04b3b01cc7aeb07962c86cfbb3c82b54425b3106 (diff)
improve linux standalone bundle instuctions, mentioning the PATH setup option
-rw-r--r--doc/install/Linux_standalone.mdwn7
-rw-r--r--standalone/linux/README14
2 files changed, 14 insertions, 7 deletions
diff --git a/doc/install/Linux_standalone.mdwn b/doc/install/Linux_standalone.mdwn
index a857ba623..d0af50222 100644
--- a/doc/install/Linux_standalone.mdwn
+++ b/doc/install/Linux_standalone.mdwn
@@ -8,7 +8,12 @@ on anything except for glibc.
[download tarball](http://downloads.kitenet.net/git-annex/linux/current/)
To use, just unpack the tarball, `cd git-annex.linux` and run `./runshell`
--- this sets up an environment where you can use `git annex`
+-- this sets up an environment where you can use `git annex`, as well
+as everything else included in the bundle.
+
+Alternatively, you can unpack the tarball, and add the directory to your
+`PATH`. This lets you use `git annex`, without overriding your system's
+own versions of git, etc.
Warning: This is a last resort. Most Linux users should instead
[[install]] git-annex from their distribution of choice.
diff --git a/standalone/linux/README b/standalone/linux/README
index 8ca68c901..18983fd7a 100644
--- a/standalone/linux/README
+++ b/standalone/linux/README
@@ -1,16 +1,18 @@
-To start the git-annex webapp, run the git-annex-webapp script in this
-directory.
+You can put this directory into your PATH, and use git-annex the same
+as if you'd installed it using a package manager.
-To enter an environment with git-annex in PATH, use runshell
+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. There are no external dependencies, except for glibc.
Any recent-ish version of glibc should work (2.13 is ok; so is 2.11).
-How it works: This directory contains a lot of libraries and programs
-that git-annex needs. But it's not a chroot. Instead, runshell sets
-PATH and LD_LIBRARY_PATH to point to the stuff in this directory.
+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 PATH
+and LD_LIBRARY_PATH to point to the stuff in here.
The glibc libs are not included. Instead, it runs with the host system's
glibc. We trust that glibc's excellent backwards and forward compatability