cleanup PKGBUILD

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74c1f9cd81d0..58a2b02feffd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = protonmail-bridge-nogui
 	pkgdesc = Integrate ProtonMail paid account with any program that supports IMAP and SMTP
 	pkgver = 1.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ProtonMail/proton-bridge
 	arch = x86_64
 	license = GPL3
@@ -14,7 +14,7 @@ pkgbase = protonmail-bridge-nogui
 	conflicts = protonmail-bridge
 	options = !emptydirs
 	options = !strip
-	source = proton-bridge-br-1.7.0.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/br-1.7.0.tar.gz
+	source = br-1.7.0.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/br-1.7.0.tar.gz
 	source = bridge.service
 	sha256sums = ee586d9b75838b62b319945eb3129e2e1fb3b2ee53431933753a4a4847dbbfd0
 	sha256sums = 6b2fd1e042b55dc6d0ffe5eb44e82ffd233452b4571ef571132600e7ec0d5d82
diff --git a/PKGBUILD b/PKGBUILD
index 61d59f8be8be..80179e3227dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,17 +14,10 @@
 # ExecStart=/usr/bin/screen -Dm -S bridgedaemon sh -c "sleep 5; protonmail-bridge -c"
 # ExecStop=/usr/bin/screen -X -S bridgedaemon quit
 
-
 pkgname=protonmail-bridge-nogui
-
-_pkgver=1.7.0
-_rev=""
-_srcver=br-1.7.0
-_srcname=proton-bridge-"$_srcver"
-
-pkgver="$_pkgver""$_rev"
-pkgrel=1
-
+pkgver=1.7.0
+_srcname=br-"$pkgver"
+pkgrel=2
 pkgdesc="Integrate ProtonMail paid account with any program that supports IMAP and SMTP"
 arch=('x86_64')
 url="https://github.com/ProtonMail/proton-bridge"
@@ -35,13 +28,13 @@ optdepends=('gnome-keyring: supported password manager (password manager is requ
             'pass: supported password manager (password manager is required)')
 conflicts=('protonmail-bridge-bin' 'protonmail-bridge')
 options=('!emptydirs' '!strip')
-source=("$_srcname.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/"$_srcver".tar.gz"
+source=("$_srcname.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/"$_srcname".tar.gz"
         "bridge.service")
 sha256sums=('ee586d9b75838b62b319945eb3129e2e1fb3b2ee53431933753a4a4847dbbfd0'
             '6b2fd1e042b55dc6d0ffe5eb44e82ffd233452b4571ef571132600e7ec0d5d82')
 
-prepare() {
-    cd "${srcdir}"/"$_srcname"/
+build() {
+    cd "${srcdir}"/proton-bridge-"$_srcname"/
     export PATH=$PATH:$(go env GOPATH)/bin/
     make clean
     make build-nogui
@@ -49,7 +42,7 @@ prepare() {
 
 package() {
     install -Dm644 "${srcdir}"/bridge.service -t "${pkgdir}"/usr/lib/systemd/user/
-    cd "${srcdir}"/"$_srcname"/
+    cd "${srcdir}"/proton-bridge-"$_srcname"/
     install -Dm644 ./LICENSE -t "${pkgdir}"/usr/share/licenses/"${pkgname}"/
     install -Dm644 ./Changelog.md -t "${pkgdir}"/usr/share/doc/"${pkgbame}"/
     install -Dm755 ./proton-bridge "${pkgdir}"/usr/bin/protonmail-bridge