hub: update to 2.12.1
This commit is contained in:
parent
ebd4c49866
commit
17b06ab634
|
@ -1,9 +1,9 @@
|
||||||
TERMUX_PKG_HOMEPAGE=https://hub.github.com/
|
TERMUX_PKG_HOMEPAGE=https://hub.github.com/
|
||||||
TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
|
TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
|
||||||
TERMUX_PKG_LICENSE="MIT"
|
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_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_PKG_DEPENDS="git"
|
||||||
|
|
||||||
termux_step_make_install() {
|
termux_step_make_install() {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
diff -u -r ../hub-2.8.3/script/build ./script/build
|
diff -uNr hub-2.12.1/script/build hub-2.12.1.mod/script/build
|
||||||
--- ../hub-2.8.3/script/build 2019-01-26 17:47:05.000000000 +0000
|
--- hub-2.12.1/script/build 2019-06-28 23:19:41.000000000 +0300
|
||||||
+++ ./script/build 2019-01-27 08:10:53.521236847 +0000
|
+++ hub-2.12.1.mod/script/build 2019-06-29 17:10:47.759789557 +0300
|
||||||
@@ -14,7 +14,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
build_hub() {
|
|
||||||
mkdir -p "$(dirname "$1")"
|
mkdir -p "$(dirname "$1")"
|
||||||
go build \
|
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` $LDFLAGS" \
|
||||||
+ -ldflags "-X github.com/github/hub/version.Version=`./script/version`" \
|
+ -ldflags "-X github.com/github/hub/version.Version=`./script/version`" \
|
||||||
-gcflags "$GCFLAGS" \
|
-gcflags "$GCFLAGS" \
|
||||||
|
|
|
@ -1,40 +1,12 @@
|
||||||
diff -u -r ../hub-2.3.0/utils/utils.go ./utils/utils.go
|
diff -uNr hub-2.12.1/utils/utils.go hub-2.12.1.mod/utils/utils.go
|
||||||
--- ../hub-2.3.0/utils/utils.go 2018-05-29 15:34:37.000000000 +0200
|
--- hub-2.12.1/utils/utils.go 2019-06-28 23:19:41.000000000 +0300
|
||||||
+++ ./utils/utils.go 2018-05-30 02:41:45.923963648 +0200
|
+++ hub-2.12.1.mod/utils/utils.go 2019-06-29 17:11:57.853729989 +0300
|
||||||
@@ -28,7 +26,7 @@
|
@@ -30,7 +30,7 @@
|
||||||
func BrowserLauncher() ([]string, error) {
|
func BrowserLauncher() ([]string, error) {
|
||||||
browser := os.Getenv("BROWSER")
|
browser := os.Getenv("BROWSER")
|
||||||
if browser == "" {
|
if browser == "" {
|
||||||
- browser = searchBrowserLauncher(runtime.GOOS)
|
- browser = searchBrowserLauncher(runtime.GOOS)
|
||||||
+ browser = "termux-open"
|
+ 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"
|
|
||||||
|
|
Loading…
Reference in New Issue