From 17b06ab634e440c10a8d163c9e2000827a767bcd Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 29 Jun 2019 17:53:41 +0300
Subject: [PATCH] hub: update to 2.12.1

---
 packages/hub/build.sh             |  4 ++--
 packages/hub/script-build.patch   | 10 ++++----
 packages/hub/utils-utils.go.patch | 40 +++++--------------------------
 3 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/packages/hub/build.sh b/packages/hub/build.sh
index 024faa434..b797bbd04 100644
--- a/packages/hub/build.sh
+++ b/packages/hub/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://hub.github.com/
 TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=2.12.0
+TERMUX_PKG_VERSION=2.12.1
 TERMUX_PKG_SRCURL=https://github.com/github/hub/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=937e0ea3ba6dcc8030889d987313efa4da27b6c54ed20fb40fbf5ff9df4c3780
+TERMUX_PKG_SHA256=315114e46bbf583e23341e171c8e1a5efdbe96c04868ff0b343cf367f65f67a0
 TERMUX_PKG_DEPENDS="git"
 
 termux_step_make_install() {
diff --git a/packages/hub/script-build.patch b/packages/hub/script-build.patch
index 4b565b76d..72b5fb6ad 100644
--- a/packages/hub/script-build.patch
+++ b/packages/hub/script-build.patch
@@ -1,10 +1,10 @@
-diff -u -r ../hub-2.8.3/script/build ./script/build
---- ../hub-2.8.3/script/build	2019-01-26 17:47:05.000000000 +0000
-+++ ./script/build	2019-01-27 08:10:53.521236847 +0000
-@@ -14,7 +14,7 @@
- build_hub() {
+diff -uNr hub-2.12.1/script/build hub-2.12.1.mod/script/build
+--- hub-2.12.1/script/build	2019-06-28 23:19:41.000000000 +0300
++++ hub-2.12.1.mod/script/build	2019-06-29 17:10:47.759789557 +0300
+@@ -15,7 +15,7 @@
    mkdir -p "$(dirname "$1")"
    go build \
+ 	  $MOD_VENDOR_ARG \
 -	  -ldflags "-X github.com/github/hub/version.Version=`./script/version` $LDFLAGS" \
 +	  -ldflags "-X github.com/github/hub/version.Version=`./script/version`" \
  	  -gcflags "$GCFLAGS" \
diff --git a/packages/hub/utils-utils.go.patch b/packages/hub/utils-utils.go.patch
index da48f9fca..ab3860b29 100644
--- a/packages/hub/utils-utils.go.patch
+++ b/packages/hub/utils-utils.go.patch
@@ -1,40 +1,12 @@
-diff -u -r ../hub-2.3.0/utils/utils.go ./utils/utils.go
---- ../hub-2.3.0/utils/utils.go	2018-05-29 15:34:37.000000000 +0200
-+++ ./utils/utils.go	2018-05-30 02:41:45.923963648 +0200
-@@ -28,7 +26,7 @@
+diff -uNr hub-2.12.1/utils/utils.go hub-2.12.1.mod/utils/utils.go
+--- hub-2.12.1/utils/utils.go	2019-06-28 23:19:41.000000000 +0300
++++ hub-2.12.1.mod/utils/utils.go	2019-06-29 17:11:57.853729989 +0300
+@@ -30,7 +30,7 @@
  func BrowserLauncher() ([]string, error) {
  	browser := os.Getenv("BROWSER")
  	if browser == "" {
 -		browser = searchBrowserLauncher(runtime.GOOS)
 +		browser = "termux-open"
+ 	} else {
+ 		browser = os.ExpandEnv(browser)
  	}
- 
- 	if browser == "" {
-@@ -38,27 +36,6 @@
- 	return strings.Split(browser, " "), nil
- }
- 
--func searchBrowserLauncher(goos string) (browser string) {
--	switch goos {
--	case "darwin":
--		browser = "open"
--	case "windows":
--		browser = "cmd /c start"
--	default:
--		candidates := []string{"xdg-open", "cygstart", "x-www-browser", "firefox",
--			"opera", "mozilla", "netscape"}
--		for _, b := range candidates {
--			path, err := exec.LookPath(b)
--			if err == nil {
--				browser = path
--				break
--			}
--		}
--	}
--
--	return browser
--}
--
- func CommandPath(cmd string) (string, error) {
- 	if runtime.GOOS == "windows" {
- 		cmd = cmd + ".exe"