updated

2 files changed, 53 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8aa54e468c8..4a86871a3933 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = browsh
 	pkgdesc = A fully-modern text-based browser, rendering to TTY and browsers
-	pkgver = 1.6.4
-	pkgrel = 3
+	pkgver = 1.8.0
+	pkgrel = 1
 	url = https://www.brow.sh
 	arch = x86_64
 	arch = i686
@@ -10,19 +10,19 @@ pkgbase = browsh
 	arch = armv7h
 	arch = aarch64
 	license = LGPL2.1
-	makedepends = go
-	makedepends = go-bindata
-	makedepends = dep
 	makedepends = git
+	makedepends = npm
+	depends = firefox>=63
 	optdepends = upx: compress binary
 	conflicts = browsh-bin
 	conflicts = browsh-git
-	noextract = browsh-1.6.4-an.fx.xpi
+	noextract = browsh-1.8.0-an.fx.xpi
 	options = !strip
-	source = https://github.com/browsh-org/browsh/archive/v1.6.4.tar.gz
-	source = https://github.com/browsh-org/browsh/releases/download/v1.6.4/browsh-1.6.4-an.fx.xpi
-	sha256sums = 965ce2d94d1d9e4b92411d344421c0bea40994527cafd694c5a6e8e206681ede
-	sha256sums = b410527a69dba88a30d8a6d341a20eb5cb1f84b684e9bc8bb6bc88a2930e0eea
+	source = https://github.com/browsh-org/browsh/archive/v1.8.0.tar.gz
+	source = https://github.com/browsh-org/browsh/releases/download/v1.8.0/browsh-1.8.0.xpi
+	source = https://dl.google.com/go/go1.18.linux-amd64.tar.gz
+	sha256sums = 81b1f9d725527f851457046845f8ed0d1fdd00fdc97d3c19e69c0bc5a7e70cd3
+	sha256sums = d76c566dfe278181d62ca57dcb2c728b4372ff31d28f6a3b21c6adb3e11ffa90
+	sha256sums = e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f
 
 pkgname = browsh
-	depends = firefox>=63
diff --git a/PKGBUILD b/PKGBUILD
index ceeffbb2bb29..32ded05247d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,51 @@
-# Maintainer: Mikuro Kagamine <mikurok@forgecrushing.com>
+# Maintainer: gilcu3 <gilcu3 at gmail dot com>
+# Contributor: Mikuro Kagamine <mikurok@forgecrushing.com>
 
 pkgname=browsh
-pkgver=1.6.4
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
+GOVERSION=1.18
 pkgdesc='A fully-modern text-based browser, rendering to TTY and browsers'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://www.brow.sh'
 license=('LGPL2.1')
-makedepends=('go' 'go-bindata' 'dep' 'git')
+makedepends=('git' 'npm')
 optdepends=('upx: compress binary')
+depends=('firefox>=63')
 conflicts=('browsh-bin' 'browsh-git')
 options=('!strip')
 noextract=("${pkgname}-${pkgver}-an.fx.xpi")
 source=("https://github.com/${pkgname}-org/${pkgname}/archive/v${pkgver}.tar.gz"
-		"https://github.com/${pkgname}-org/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}-an.fx.xpi")
-sha256sums=('965ce2d94d1d9e4b92411d344421c0bea40994527cafd694c5a6e8e206681ede'
-			'b410527a69dba88a30d8a6d341a20eb5cb1f84b684e9bc8bb6bc88a2930e0eea')
+		"https://github.com/${pkgname}-org/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.xpi"
+		"https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz")
+sha256sums=('81b1f9d725527f851457046845f8ed0d1fdd00fdc97d3c19e69c0bc5a7e70cd3'
+            'd76c566dfe278181d62ca57dcb2c728b4372ff31d28f6a3b21c6adb3e11ffa90'
+            'e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f')
 
 
 prepare() {
-	## Go is fussy.
-	export GOPATH="${srcdir}/.gopath"
-	export _interfacer="${GOPATH}/src/${pkgname}/interfacer"
-	export GO111MODULE=off
-	mkdir -p "${GOPATH}/src"
-	mv "${srcdir}/${pkgname}-${pkgver}" "${GOPATH}/src/${pkgname}"
-	cd "${_interfacer}"
+	cw=$(pwd)
+	export GOPATH=$cw/home/go
+	mkdir -p $GOPATH
+	export GOROOT=$cw/go
+	mkdir -p $GOROOT
+	export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
+	if [[ -e "${GOPATH}/src/github.com/browsh-org" ]]
+	then
+		rm -r "${GOPATH}/src/github.com/browsh-org"
+	fi
+	mkdir -p "${GOPATH}/src/github.com/browsh-org/${pkgname}"
+  	ln -sf  "../../../../../../${pkgname}-${pkgver}/interfacer/" "${GOPATH}/src/github.com/browsh-org/${pkgname}/interfacer"
+	_interfacer="${GOPATH}/src/github.com/browsh-org/${pkgname}/interfacer"
+	
+	go install github.com/shuLhan/go-bindata/v4/cmd/go-bindata@master
+
+	cd ${_interfacer}
+	
 
 	echo Turn webext into an embeddable binary...
 	xpipath="$(mktemp -d)"
-	cp "${srcdir}/${pkgname}-${pkgver}-an.fx.xpi" "${xpipath}/${pkgname}.xpi"
+	cp "${srcdir}/${pkgname}-${pkgver}.xpi" "${xpipath}/${pkgname}.xpi"
 	if [ $(which upx 2>/dev/null) ]; then
 		_compress="-nocompress"
 	else
@@ -37,24 +53,28 @@ prepare() {
 	go-bindata	$_compress\
 				-prefix "${xpipath}"\
 				-pkg $pkgname\
-				-o "${_interfacer}/src/${pkgname}/webextension.go"\
+				-o "${_interfacer}/src/${pkgname}/${pkgname}.xpi"\
 				"${xpipath}/${pkgname}.xpi"
 	rm -r "${xpipath}"
 
-	echo Install $pkgname dependencies...
-	dep ensure
 }
 
 build() {
-	export GOPATH="${srcdir}/.gopath"
-	export _interfacer="${GOPATH}/src/${pkgname}/interfacer"
-	export GO111MODULE=off
+	cw=$(pwd)
+	export GOPATH=$cw/home/go
+	ls $GOPATH
+	export GOROOT=$cw/go
+	export _interfacer="${GOPATH}/src/github.com/browsh-org/${pkgname}/interfacer"
+
+
 	cd "$_interfacer"
 	echo Build ${pkgname}...
+	local webextension="src/browsh/browsh.xpi"
+	md5sum "$webextension"
 	go build	-x\
 				-gcflags "all=-trimpath=${GOPATH}"\
 				-asmflags "all=-trimpath=${GOPATH}"\
-				-o "${srcdir}/${pkgname}" ./src/main.go
+				 -o "${srcdir}/${pkgname}" ./cmd/browsh 
 	strip --strip-all "${srcdir}/${pkgname}"
 	if [ $(which upx 2>/dev/null) ]; then
 		echo Compressing ${pkgname} with UPX...
@@ -62,6 +82,5 @@ build() {
 }
 
 package() {
-	depends=('firefox>=63')
 	install -Dm755 $pkgname "${pkgdir}/usr/bin/${pkgname}"
 }