R6.6 round 1 fix: no Git says to install ElyTree; Linux keeps Mark's Git
git::own returns git::NoGit when neither the app nor ElyTree has Git; ElyMark's Git item then reads 'needs ElyTree'. Linux AppImages stand alone, so ElyMark keeps its Git there (packages share the AppDir). The bundle fixture now has ElyTree's executable folder. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
5958e73ade
commit
8580aed6b0
8 files changed
+71
-19
No files matched your search
@@ -88,8 +88,8 @@ case $slug in
|
||||
put KaTeX "$katex/fonts/OFL.txt" "$katex/fonts/FONT_NOTICE.txt"
|
||||
;;
|
||||
esac
|
||||
# ElyTree carries Git.
|
||||
if [ "$slug" = ely-tree ]; then
|
||||
# ElyTree carries Git; on Linux ElyMark does too.
|
||||
if [ "$slug" = ely-tree ] || { [ "$slug" = ely-mark ] && [ "$(uname)" = Linux ]; }; then
|
||||
case $(uname) in
|
||||
MINGW* | MSYS*) put Git "$root/engines/git/LICENSE.txt" ;;
|
||||
*) put Git "$root/engines/git-src/COPYING" "$root/engines/git-src/LGPL-2.1" ;;
|
||||
|
||||
+2
-2
@@ -64,8 +64,8 @@ if [ "$slug" = ely-pdf ]; then
|
||||
mkdir "$out/tessdata"
|
||||
cp "$tessdata"/{eng,chi_sim,chi_tra}.traineddata "$out/tessdata/"
|
||||
fi
|
||||
# ElyTree carries Git; ElyMark uses its copy.
|
||||
if [ "$slug" = ely-tree ]; then
|
||||
# ElyTree carries Git; on Linux, whose AppImage stands alone, ElyMark too.
|
||||
if [ "$slug" = ely-tree ] || { [ "$slug" = ely-mark ] && [ "$(uname)" = Linux ]; }; then
|
||||
need "$root/engines/git" "scripts/build-git.sh and scripts/fetch-git-lfs.sh"
|
||||
cp -R "$root/engines/git" "$out/git"
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user