adding stuff and updpkgver

4 files changed, 52 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a3dfd973c68..4e7be51701f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,24 @@
 pkgbase = tabby
-	pkgdesc = A terminal for a modern age
+	pkgdesc = A terminal for a more modern age
 	pkgver = 1.0.181
-	pkgrel = 1
-	url = https://github.com/Eugeny/tabby#readme
+	pkgrel = 2
+	url = https://eugeny.github.io/terminus/
 	arch = x86_64
 	license = MIT
-	depends = gnome-keyring
-	depends = libsecret
-	provides = tabby
-	source = tabby-1.0.181-linux.pacman::https://github.com/Eugeny/tabby/releases/download/v1.0.181/tabby-1.0.181-linux-x64.pacman
-	sha256sums = 7e4feec0ee596957c0e4fc5621cd6e0978440b581e856d8e1f3ffcae806cd59d
+	makedepends = git
+	makedepends = npm
+	makedepends = yarn
+	makedepends = python
+	makedepends = nodejs-lts-gallium
+	makedepends = cmake
+	makedepends = node-gyp
+	depends = glib2
+	depends = gtk3
+	depends = nss
+	depends = libxcrypt-compat
+	conflicts = terminus-terminal
+	replaces = terminus-terminal
+	source = git+https://github.com/Eugeny/tabby.git#tag=v1.0.181
+	sha256sums = SKIP
 
 pkgname = tabby
diff --git a/PKGBUILD b/PKGBUILD
index 19fd1f146f46..430a70aba903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,39 @@
+# Maintainer: Solomon Choina <shlomochoina@gmail.com>
 pkgname=tabby
 pkgver=1.0.181
-pkgrel=1
-pkgdesc="A terminal for a modern age"
-arch=("x86_64")
-url="https://github.com/Eugeny/tabby#readme"
-license=("MIT")
-provides=("tabby")
-depends=(
-    "gnome-keyring"
-    "libsecret"
-)
-source=(
-    "tabby-${pkgver}-linux.pacman::https://github.com/Eugeny/tabby/releases/download/v${pkgver}/tabby-${pkgver}-linux-x64.pacman"
-)
-sha256sums=(
-    "7e4feec0ee596957c0e4fc5621cd6e0978440b581e856d8e1f3ffcae806cd59d"
-)
+pkgrel=2
+pkgdesc="A terminal for a more modern age"
+arch=('x86_64')
+url="https://eugeny.github.io/terminus/"
+license=('MIT')
+conflicts=('terminus-terminal')
+replaces=('terminus-terminal')
+depends=('glib2' 'gtk3' 'nss' 'libxcrypt-compat')
+makedepends=('git' 'npm' 'yarn' 'python' 'nodejs-lts-gallium' 'cmake' 'node-gyp')
+source=("git+https://github.com/Eugeny/tabby.git#tag=v$pkgver")
+sha256sums=('SKIP')
+
+build(){
+  cd "$srcdir/$pkgname/"
+  export ARCH=x86_64
+  yarn install
+  ./scripts/install-deps.js
+  yarn run build
+  ./scripts/build-native.js
+  ./node_modules/.bin/electron-builder --linux deb
+}
 
 package() {
-    cd ${srcdir}
-    tar -xvf tabby-${pkgver}-linux.pacman -C ${pkgdir}
-    # Remove exsiting files
-    rm -f ${pkgdir}/.PKGINFO ${pkgdir}/.MTREE ${pkgdir}/.INSTALL
+  cd "$srcdir/$pkgname/dist/"
+  ar x *.deb
+  tar -xf data.tar.xz
+  cp -r usr/ "$pkgdir"
+  cp -r opt/ "$pkgdir"
+
+ install -Dm755 /dev/stdin "$pkgdir"/usr/bin/"$pkgname" <<END
+  #!/usr/bin/bash
+  /opt/Tabby/tabby
+
+END
+
 }
diff --git a/PKGBUILD.template b/PKGBUILD.template
deleted file mode 100644
index e0d090ada107..000000000000
--- a/PKGBUILD.template
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=tabby
-pkgver=<PKGVER>
-pkgrel=1
-pkgdesc="A terminal for a modern age"
-arch=("x86_64")
-url="https://github.com/Eugeny/tabby#readme"
-license=("MIT")
-provides=("tabby")
-depends=(
-    "gnome-keyring"
-    "libsecret"
-)
-source=(
-    "tabby-${pkgver}-linux.pacman::https://github.com/Eugeny/tabby/releases/download/v${pkgver}/tabby-${pkgver}-linux-x64.pacman"
-)
-sha256sums=(
-    "<SHA256>"
-)
-
-package() {
-    cd ${srcdir}
-    tar -xvf tabby-${pkgver}-linux.pacman -C ${pkgdir}
-    # Remove exsiting files
-    rm -f ${pkgdir}/.PKGINFO ${pkgdir}/.MTREE ${pkgdir}/.INSTALL
-}
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 6a75234aa42f..000000000000
--- a/update.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -xve
-export BASEDIR=$(dirname "$0")
-cd "$BASEDIR"
-
-pip install lastversion
-
-export REPO_URL="https://github.com/Eugeny/tabby"
-export PACKAGE_VER=$(python -m lastversion $REPO_URL)
-export FILENAME="tabby-$PACKAGE_VER-linux-x64.pacman"
-export RELEASE_URL="$REPO_URL/releases/download/v$PACKAGE_VER/$FILENAME"
-
-curl -Lf "$RELEASE_URL" > $FILENAME
-
-export SHA256=$(sha256sum "$FILENAME" | cut -d " " -f1)
-
-cat PKGBUILD.template | sed "s/<PKGVER>/$PACKAGE_VER/g" | sed "s/<SHA256>/$SHA256/g" | tee PKGBUILD
-
-rm "$FILENAME"