upgpkg: onivim2-git 574.c6776918-1

1 files changed, 27 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1cb78b648538..39130934d6e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
 # Contributor: Frederick Gnodtke <frederick@gnodtke.net>
 
 pkgname=onivim2-git
-pkgver=554.f4cd1e28
+pkgver=574.c6776918
 pkgrel=1
 pkgdesc='Native, lightweight modal code editor'
 arch=('any')
 url='https://github.com/onivim/oni2'
-license=('comercial')
-makedepends=('git' 'esy' 'ragel' 'nodejs')
+license=('commercial')
+makedepends=('git' 'esy' 'ragel' 'nodejs' 'wget' 'bzip2' 'esy' 'fontconfig' 'fuse2' 'git' 'glu' 'gtk3' 'harfbuzz'
+              'libglvnd' 'libice' 'libpng' 'libsm' 'libx11' 'libxcursor' 'libxext' 'libxi' 'libxinerama' 'libxrandr'
+              'libxt' 'libxxf86vm' 'm4' 'nodejs' 'ragel' 'wget' 'fuse2')
 options=('!strip')
 source=("${pkgname}::git+https://github.com/onivim/oni2.git#branch=master")
 sha512sums=('SKIP')
@@ -21,28 +23,35 @@ pkgver() {
 # set ESY__PREFIX to avoid 5G of dependency cache ending up in ~/.esy
 build() {
   cd ${pkgname}
-  ESY__PREFIX=${srcdir}/esy_cache esy install
-  ESY__PREFIX=${srcdir}/esy_cache esy bootstrap
-  ESY__PREFIX=${srcdir}/esy_cache esy build
-  ESY__PREFIX=${srcdir}/esy_cache esy x Oni2 -f --checkhealth
-  ESY__PREFIX=${srcdir}/esy_cache esy create-release
+  export ESY__PREFIX="${srcdir}"/esy_cache
+  esy install
+  esy bootstrap
+  esy build
+  esy x Oni2 -f --checkhealth
+  esy create-release
 }
 
 check() {
   cd ${pkgname}
-  ESY__PREFIX=${srcdir}/esy_cache esy '@bench' install
-  ESY__PREFIX=${srcdir}/esy_cache esy '@bench' build
-  ESY__PREFIX=${srcdir}/esy_cache esy '@bench' run
+  export ESY__PREFIX="${srcdir}"/esy_cache
+  esy '@bench' install
+  esy '@bench' build
+  esy '@bench' run
 }
 
 package() {
-  install -d -m 755 "${pkgdir}/opt/"
-  install -d -m 755 "${pkgdir}/usr/bin/"
+  install -dm755 "${pkgdir}"/opt/onivim2
+  install -dm755 "${pkgdir}"/usr/bin/
 
   cd ${pkgname}/_release/
-  install -D -m 644 Onivim2.AppDir/usr/share/applications/Onivim2.desktop "${pkgdir}/usr/share/applications/Onivim2.desktop"
-  install -D -m 644 Onivim2.AppDir/usr/share/icons/hicolor/512x512/apps/Onivim2.png "${pkgdir}/usr/share/pixmaps/Onivim2.png"
-  cp -ar Onivim2.AppDir "${pkgdir}/opt/onivim2"
-  cp -ar linux/bin "${pkgdir}/opt/onivim2/usr/"
-  ln -s "${pkgdir}/opt/onivim2/AppRun" "${pkgdir}/usr/bin/Oni2"
+  install -Dm644 Onivim2.AppDir/usr/share/applications/Onivim2.desktop "${pkgdir}"/usr/share/applications/Onivim2.desktop
+  install -Dm644 Onivim2.AppDir/usr/share/icons/hicolor/512x512/apps/Onivim2.png "${pkgdir}"/usr/share/pixmaps/Onivim2.png
+  cp -Lr Onivim2.AppDir/{AppRun,usr} "${pkgdir}"/opt/onivim2
+  cp -r $(find "${srcdir}"/esy_cache -type d -path '*i/*camomile-opam*/share/camomile') "${pkgdir}"/opt/onivim2/usr/share
+  ln -s /opt/onivim2/AppRun "${pkgdir}"/usr/bin/Oni2
+  # fix permissions
+  find "${pkgdir}" -type f -exec chmod 644 {} \;
+  chmod 755 "${pkgdir}"/opt/onivim2/AppRun \
+    "${pkgdir}"/opt/onivim2/usr/bin/{Oni2*,node,rg} \
+    "${pkgdir}"/opt/onivim2/usr/lib/*
 }