Fix broken .config/git-annex/program installed by standalone tarball.
It was doubly broken; both missing a slash, and containing "runshell git-annex", while some parts of the code expected it to be a simple path to a program. This appears to include the transfer queue runner, and the code that starts a new assistant process when switching to another repository in the webapp.
This commit is contained in:
parent
abd7d11ea0
commit
51aa988a9f
5 changed files with 54 additions and 1 deletions
|
@ -39,7 +39,7 @@ ensureInstalled = go =<< standaloneAppBase
|
||||||
where
|
where
|
||||||
go Nothing = noop
|
go Nothing = noop
|
||||||
go (Just base) = do
|
go (Just base) = do
|
||||||
let program = base ++ "runshell git-annex"
|
let program = base <$> "git-annex"
|
||||||
programfile <- programFile
|
programfile <- programFile
|
||||||
createDirectoryIfMissing True (parentDir programfile)
|
createDirectoryIfMissing True (parentDir programfile)
|
||||||
writeFile programfile program
|
writeFile programfile program
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -2,6 +2,7 @@ git-annex (3.20121128) UNRELEASED; urgency=low
|
||||||
|
|
||||||
* webapp: Defaults to sharing box.com account info with friends, allowing
|
* webapp: Defaults to sharing box.com account info with friends, allowing
|
||||||
one-click enabling of the repository.
|
one-click enabling of the repository.
|
||||||
|
* Fix broken .config/git-annex/program installed by standalone tarball.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Wed, 28 Nov 2012 13:31:07 -0400
|
-- Joey Hess <joeyh@debian.org> Wed, 28 Nov 2012 13:31:07 -0400
|
||||||
|
|
||||||
|
|
|
@ -16,3 +16,5 @@ git-annex=3.20121127 on Ubuntu 12.04 LTS
|
||||||
## Please provide any additional information below.
|
## Please provide any additional information below.
|
||||||
|
|
||||||
Otherwise it is working great.
|
Otherwise it is working great.
|
||||||
|
|
||||||
|
> I've fixed this. [[done]] --[[Joey]]
|
||||||
|
|
25
standalone/linux/git-annex
Executable file
25
standalone/linux/git-annex
Executable file
|
@ -0,0 +1,25 @@
|
||||||
|
#!/bin/sh
|
||||||
|
base="$(dirname $0)"
|
||||||
|
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
|
||||||
|
|
||||||
|
"$base/runshell" git-annex "$@"
|
25
standalone/osx/git-annex.app/Contents/MacOS/git-annex
Executable file
25
standalone/osx/git-annex.app/Contents/MacOS/git-annex
Executable file
|
@ -0,0 +1,25 @@
|
||||||
|
#!/bin/sh
|
||||||
|
base="$(dirname $0)"
|
||||||
|
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
|
||||||
|
|
||||||
|
"$base/runshell" git-annex "$@"
|
Loading…
Add table
Add a link
Reference in a new issue