diff --git a/packages/hub/build.sh b/packages/hub/build.sh index 94f6aa28e..d9e9d0be5 100644 --- a/packages/hub/build.sh +++ b/packages/hub/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://hub.github.com/ TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" -TERMUX_PKG_VERSION=2.2.8 +TERMUX_PKG_VERSION=2.3.0 +TERMUX_PKG_SHA256=69e48105f7287537e7afaf969825666c1f09267eae3507515151900487342fae TERMUX_PKG_SRCURL=https://github.com/github/hub/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=5ff475990a5bd335bad8da2d140ea0966c33e6d03dac26bf1558bda94a02b924 TERMUX_PKG_DEPENDS="git" termux_step_make_install() { @@ -13,6 +13,6 @@ termux_step_make_install() { ./script/build cp bin/hub $TERMUX_PREFIX/bin/ - mkdir -p $TERMUX_PREFIX/share/man/man1/ - cp man/hub.1 $TERMUX_PREFIX/share/man/man1/ + #mkdir -p $TERMUX_PREFIX/share/man/man1/ + #cp man/hub.1 $TERMUX_PREFIX/share/man/man1/ } diff --git a/packages/hub/utils-utils.go.patch b/packages/hub/utils-utils.go.patch index 20017a7e5..da48f9fca 100644 --- a/packages/hub/utils-utils.go.patch +++ b/packages/hub/utils-utils.go.patch @@ -1,25 +1,16 @@ -diff -u -r ../hub-2.2.8/utils/utils.go ./utils/utils.go ---- ../hub-2.2.8/utils/utils.go 2016-09-11 14:47:09.000000000 -0400 -+++ ./utils/utils.go 2016-09-29 19:20:23.557570185 -0400 -@@ -3,8 +3,6 @@ - import ( - "errors" - "os" -- "os/exec" -- "runtime" - "strings" - - "github.com/github/hub/ui" -@@ -24,7 +22,7 @@ +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 @@ func BrowserLauncher() ([]string, error) { browser := os.Getenv("BROWSER") if browser == "" { - browser = searchBrowserLauncher(runtime.GOOS) -+ browser = "termux-open-url" ++ browser = "termux-open" } if browser == "" { -@@ -34,27 +32,6 @@ +@@ -38,27 +36,6 @@ return strings.Split(browser, " "), nil } @@ -44,6 +35,6 @@ diff -u -r ../hub-2.2.8/utils/utils.go ./utils/utils.go - return browser -} - - func IsOption(confirm, short, long string) bool { - return strings.EqualFold(confirm, short) || strings.EqualFold(confirm, long) - } + func CommandPath(cmd string) (string, error) { + if runtime.GOOS == "windows" { + cmd = cmd + ".exe"