summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFFY002018-08-14 13:44:46 +0100
committerFFY002018-08-14 13:44:46 +0100
commit17645de07b2e2a1f86fadc2ad0e0ea5834cd7692 (patch)
tree374f35b91d71860c619d3a76cadb36689ba19b0b
parent50655e080d7a5e22b3ad17b3aaa3c8fb7078422c (diff)
downloadaur-17645de07b2e2a1f86fadc2ad0e0ea5834cd7692.tar.gz
pkgbuild: fix install
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD47
2 files changed, 20 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9dfcffee7897..496c3ea76cd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,13 +2,11 @@ pkgbase = franz
pkgdesc = Free messaging app for services like WhatsApp, Slack, Messenger and many more.
pkgver = 5.0.0_beta.18
pkgrel = 1
- url = https://meetfranz.com/
+ url = https://meetfranz.com
arch = i686
arch = x86_64
license = Apache
- makedepends = yarn
makedepends = npm
- makedepends = git
makedepends = python2
depends = nodejs
depends = libx11
@@ -21,7 +19,6 @@ pkgbase = franz
depends = nss
depends = libxtst
depends = nodejs-nan
- conflicts = franz-bin
source = https://github.com/meetfranz/franz/archive/v5.0.0-beta.18.tar.gz
source = franz.desktop
sha256sums = 24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2
diff --git a/PKGBUILD b/PKGBUILD
index 6c3740861552..ecbd55d589b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,36 @@
-# Maintainer: Filipe Laíns (FFY00) <filipe.lains@gmail.com>
+# Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
# Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
+
pkgname=franz
-pkgver=5.0.0_beta.18
+_pkgver=5.0.0-beta.18
+pkgver=${_pkgver//-/_}
pkgrel=1
pkgdesc="Free messaging app for services like WhatsApp, Slack, Messenger and many more."
arch=('i686' 'x86_64')
-url="https://meetfranz.com/"
+url="https://meetfranz.com"
license=('Apache')
depends=('nodejs' 'libx11' 'libxkbfile' 'libxext' 'libxss' 'gconf' 'gtk2' 'alsa-lib' 'nss' 'libxtst' 'nodejs-nan')
-makedepends=('yarn' 'npm' 'git' 'python2')
-conflicts=('franz-bin')
-source=(
- "https://github.com/meetfranz/$pkgname/archive/v${pkgver//_/-}.tar.gz"
- 'franz.desktop'
-)
-sha256sums=(
- '24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2'
- '79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8'
-)
-
-prepare() {
- cd "$pkgname-${pkgver//_/-}"
- sed -i 's/"electron-updater": "[0-9.^]*"/"electron-updater": "^2.18.2"/' package.json
- sed -i 's/"electron-builder": "[0-9.^]*"/"electron-builder": "^19.47.0"/' package.json
-}
+makedepends=('npm' 'python2')
+source=("https://github.com/meetfranz/$pkgname/archive/v$_pkgver.tar.gz"
+ 'franz.desktop')
+sha256sums=('24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2'
+ '79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8')
build() {
- cd "$pkgname-${pkgver//_/-}"
- yarn install --production --non-interactive
- yarn add electron-builder gulpjs/gulp#4.0
+ cd $pkgname-$_pkgver
+ npm install --production --non-interactive
+ npm add electron-builder gulpjs/gulp#4.0
node_modules/.bin/gulp build
node_modules/.bin/electron-builder --linux dir
}
package() {
- cd "$pkgname-${pkgver//_/-}"
+ cd $pkgname-$_pkgver
- install -d "$pkgdir/usr/bin" "$pkgdir/usr/share"
- cp -r --preserve=mode out/linux-unpacked "$pkgdir/usr/share/franz"
+ install -d "$pkgdir"/usr/bin "$pkgdir"/usr/share
+ cp -r --no-preserve=ownership --preserve=mode out/linux-unpacked "$pkgdir"/usr/share/franz
- install -Dm644 "$srcdir/franz.desktop" "$pkgdir/usr/share/applications/franz.desktop"
- install -Dm644 "build-helpers/images/icon.png" "$pkgdir/usr/share/icons/hicolor/1024x1024/apps/franz.png"
- ln -s "/usr/share/franz/franz" "$pkgdir/usr/bin/franz"
+ install -Dm644 "$srcdir"/franz.desktop "$pkgdir"/usr/share/applications/franz.desktop
+ install -Dm644 build-helpers/images/icon.png "$pkgdir"/usr/share/icons/hicolor/1024x1024/apps/franz.png
+ ln -s /usr/share/franz/franz "$pkgdir"/usr/bin/franz
}