Update to 0.7.11. Refactor a bit.

1 files changed, 57 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 57d1e7a2d134..5688aaab7e6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,77 @@
-# $Id$
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Salamandar <felix at piedallu dot me>
 
-pkgname=beaker-browser
 _pkgname=beaker
-pkgver=0.7.10
+pkgname=beaker-browser
+pkgver=0.7.11
 pkgrel=1
 pkgdesc="Peer-to-peer web browser with tools to create and host websites"
 arch=(x86_64)
 url="https://github.com/beakerbrowser/beaker"
-license=(MIT)
-depends=(electron)
-makedepends=(git npm python2)
+license=('MIT')
+depends=(
+  'electron'
+)
+makedepends=(
+  'git'
+  'npm'
+  'python2'
+)
+source=(
+  "${_pkgname}-${pkgver}.tar.gz::https://github.com/beakerbrowser/${_pkgname}/archive/${pkgver}.tar.gz"
+  "${_pkgname}.sh"
+  "${_pkgname}.desktop"
+)
+sha256sums=(
+  '5e3541868ffbf4a9085fb12e863192b682c84e7bb02899b3e7a4bd7125f505e8'
+  '23ea9820de249cb65d319e943d200940d929a3c8261b5d978848ddc44554728f'
+  'f6ac7e3d7d8d729afc32b804bab9b6f1b5ae0f0b8d350c17c8f6efba222b6165'
+)
+
 options=(!strip)
-source=($_pkgname-$pkgver.tar.gz::https://github.com/beakerbrowser/$_pkgname/archive/$pkgver.tar.gz
-        $_pkgname.sh
-        $_pkgname.desktop)
-sha256sums=('0ab22342a0727e2ccba8ad712956be5526f454a3e6df309b9c4bb9eb1f23e4b8'
-            '23ea9820de249cb65d319e943d200940d929a3c8261b5d978848ddc44554728f'
-            'f6ac7e3d7d8d729afc32b804bab9b6f1b5ae0f0b8d350c17c8f6efba222b6165')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   npm install
-
-  rm -r app/node_modules/*-native/prebuilds
+  #see https://github.com/electron/electron/issues/5851
   sed -i "s|--target=[^ ]* |--target=$(</usr/lib/electron/version) |" tasks/rebuild.js
-  sed -i 's/python/python2/' app/node_modules/sqlite3/deps/sqlite3.gyp
+  sed -i 's|python|python2|' app/node_modules/sqlite3/deps/sqlite3.gyp
+  rm -r app/node_modules/*-native/prebuilds
+
   npm run rebuild
 }
 
 package() {
-  mkdir -p "$pkgdir"/usr/{lib,share/pixmaps}
-  cp -r $_pkgname-$pkgver/app "$pkgdir/usr/lib/$_pkgname"
-  ln -s ../../lib/$_pkgname/assets/img/logo.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  install -Dm755 $_pkgname.sh "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  cd "${srcdir}"
 
-  install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
-  sed -n '/## License/,$p' $_pkgname-$pkgver/README.md > "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  mkdir -p "${pkgdir}/usr/"{lib,share/pixmaps}
+
+  install -Dm755 "${_pkgname}.sh"                             "${pkgdir}/usr/bin/${_pkgname}"
+  install -Dm644 "${_pkgname}.desktop"                        "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  install -dm755                                              "${pkgdir}/usr/share/licenses/${_pkgname}"
+  sed -n '/## License/,$p' "${_pkgname}-${pkgver}/README.md" >"${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
+  ln -s "../../lib/${_pkgname}/assets/img/logo.png"           "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+  cp -r "${_pkgname}-${pkgver}/app"                           "${pkgdir}/usr/lib/${_pkgname}"
 
   # Clean up
-  find "$pkgdir/usr/lib/$_pkgname/node_modules" \
-      -name "package.json" \
-        -exec sed -e "s|$srcdir/$_pkgname|/usr/lib/$_pkgname|" \
-            -i {} \; \
-      -or -name ".*" -prune -exec rm -r '{}' \; \
-      -or -name "*.gyp" -prune -exec rm -r '{}' \; \
-      -or -name "*.gypi" -prune -exec rm -r '{}' \; \
-      -or -name "*.mk" -prune -exec rm -r '{}' \; \
-      -or -name "*Makefile" -prune -exec rm -r '{}' \; \
-      -or -name "bin" -prune -exec rm -r '{}' \; \
-      -or -name "deps" -prune -exec rm -r '{}' \; \
-      -or -name "doc" -prune -exec rm -r '{}' \; \
-      -or -name "example" -prune -exec rm -r '{}' \; \
-      -or -name "man" -prune -exec rm -r '{}' \; \
-      -or -name "nan" -prune -exec rm -r '{}' \; \
-      -or -name "obj.target" -prune -exec rm -r '{}' \; \
-      -or -name "script" -prune -exec rm -r '{}' \; \
-      -or -name "test" -prune -exec rm -r '{}' \; \
-      -or -name "tmp" -prune -exec rm -r '{}' \;
+  find "${pkgdir}/usr/lib/${_pkgname}/node_modules" -name "package.json" \
+    -exec sed -e "s|${srcdir}/${_pkgname}|/usr/lib/${_pkgname}|" -i {} \; \
+
+  find "${pkgdir}/usr/lib/${_pkgname}/node_modules" \
+    \(  -name ".*" \
+    -or -name "*.gyp" \
+    -or -name "*.gypi" \
+    -or -name "*.mk" \
+    -or -name "*Makefile" \
+    -or -name "bin" \
+    -or -name "deps" \
+    -or -name "doc" \
+    -or -name "example" \
+    -or -name "man" \
+    -or -name "nan" \
+    -or -name "obj.target" \
+    -or -name "script" \
+    -or -name "test" \
+    -or -name "tmp" \
+    \) -prune -exec rm -r '{}' \;
 }