haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix detection of browser to use for git help.

Browse Source
This commit is contained in:
Adrien Destugues
2018-11-18 11:59:41 +01:00
parent 37d7998faf
commit 57f0d0e5d1
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dev-vcs/git/patches/git-2.19.1.patchset
View File

@@ -1,4 +1,4 @@
From 7d19038ccca2379140022037e6861a8f8d5fe8fa Mon Sep 17 00:00:00 2001
From 3a21775c27aaad2806349cdf88b1aece7b143b8a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 13 Aug 2013 08:07:25 +0200
Subject: git-web--browse.sh: use "open" on Haiku
@@ -21,10 +21,10 @@ index ae15253..b074d1a 100755
init_browser_path $i
if type "$browser_path" > /dev/null 2>&1; then
--
2.14.2
2.19.1
From c28ebdeca7e0ad7a4d14a1026a5471ee2d8937db Mon Sep 17 00:00:00 2001
From 19414f690ec4186b9a53b24879dab5caa12e6470 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 19 Jan 2015 15:37:16 -0500
Subject: On Haiku use the user settings directory instead of HOME
@@ -67,10 +67,10 @@ index 34f0f98..4ac1724 100644
home = getenv("HOME");
if (home)
--
2.14.2
2.19.1
From bb13568f941bb3e59a8e33f91676364313544614 Mon Sep 17 00:00:00 2001
From 6d966f301224d0606b60bf2037e2407aacea34e4 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Mon, 19 Jan 2015 15:50:09 -0500
Subject: Ensure config-directory exists before using it.
@@ -102,10 +102,10 @@ index 3461993..883c1d0 100644
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.16.3
2.19.1
From 66ce1d4e8611573bde7ae110d015c45cc5529adf Mon Sep 17 00:00:00 2001
From d4c9f44acb151692230a643db7807d7d5fbe11a9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:32:12 +0100
Subject: Move credential cache to the config directory.
@@ -126,10 +126,10 @@ index 1cccc3a..076f6fa 100644
socket = xstrfmt("%s/socket", old_dir);
else
--
2.14.2
2.19.1
From 6cc7223d58b1fbb829d462e682ba32b7ebf91404 Mon Sep 17 00:00:00 2001
From b0e6909d55205f65c4d66b117a079e67af4e9f45 Mon Sep 17 00:00:00 2001
From: sfanxiang <sfanxiang@gmail.com>
Date: Mon, 1 Jan 2018 13:26:28 +0000
Subject: builtin: config: use xdg_config even if it does not exist
@@ -167,5 +167,32 @@ index 97b58c4..395ed85 100644
}
else if (use_system_config)
--
2.16.3
2.19.1
From 6acf57f28109f6f9e6fd258422ec1aedd9f005ac Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 18 Nov 2018 11:56:26 +0100
Subject: Fix detection of HAiku for git web browse
The bootloader was renamed, so it is not a reliable thing to use. Detect
the BEINCLUDES environment variable instead.
diff --git a/git-web--browse.sh b/git-web--browse.sh
index b074d1a..0f95000 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -133,8 +133,8 @@ if test -z "$browser" ; then
browser_candidates="cygstart $browser_candidates"
fi
- # /boot/system/haiku_loader indicates Haiku
- if test -f /boot/system/haiku_loader; then
+ # BEINCLUDES indicates Haiku
+ if test -n "$BEINCLUDES"; then
browser_candidates="open $browser_candidates"
fi
--
2.19.1