Adapt to changes from google-calendar-nativefier

Thanks to alecmev

3 files changed, 50 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 134c600411d8..a2ad4388376b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = google-calendar-nativefier-dark
-	pkgdesc = Electron wrapper for the Google Calendar web application with dark theme (by pyxelr)
-	pkgver = 0.9.2
+	pkgdesc = Google Calendar in shared Electron runtime with dark theme (by pyxelr)
+	pkgver = 2021.04.24
 	pkgrel = 1
 	url = https://calendar.google.com
 	arch = x86_64
 	license = MIT
-	makedepends = nodejs
+	makedepends = gendesk
 	makedepends = nodejs-nativefier
-	makedepends = npm
+	depends = electron
 	source = google-calendar-nativefier-dark.png
-	source = google-calendar-nativefier-dark.desktop
 	source = google-calendar-nativefier-dark.js
 	sha256sums = 97e7237e745704869306cc96856e320d673140ff6f91f9ed61b592e7afc0f176
-	sha256sums = 28a8e5d48c8cb41998b47ebfde05ad8c765bd15cc5e66cf036e3419547562612
 	sha256sums = bd1a3d162153596ac3bda552de689d0bde95f038fcaf4f0d1143b2bdf16d03b2
 
 pkgname = google-calendar-nativefier-dark
diff --git a/PKGBUILD b/PKGBUILD
index 2e6b57d8045f..f38ff0e9bb4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,57 @@
+# Maintainer: akaessens
+
 pkgname=google-calendar-nativefier-dark
-pkgver=0.9.2
+pkgver=2021.04.24
 pkgrel=1
-# Dark theme by pyxelr (https://userstyles.org/styles/143026/dark-google-calendar-2020)
-
-pkgdesc="Electron wrapper for the Google Calendar web application with dark theme (by pyxelr)"
-arch=(x86_64)
-license=(MIT)
-url=https://calendar.google.com
-source=($pkgname.png
-        $pkgname.desktop
-        $pkgname.js)
-makedepends=(nodejs nodejs-nativefier npm)
+pkgdesc='Google Calendar in shared Electron runtime with dark theme (by pyxelr)'
+arch=('x86_64')
+url='https://calendar.google.com'
+license=('MIT')
+depends=('electron')
+makedepends=(
+  'gendesk'
+  'nodejs-nativefier'
+)
+source=("${pkgname}.png" "${pkgname}.js")
 sha256sums=('97e7237e745704869306cc96856e320d673140ff6f91f9ed61b592e7afc0f176'
-            '28a8e5d48c8cb41998b47ebfde05ad8c765bd15cc5e66cf036e3419547562612'
             'bd1a3d162153596ac3bda552de689d0bde95f038fcaf4f0d1143b2bdf16d03b2')
 
-_instname=google-calendar-dark
+_name='Google Calendar Dark'
+
+prepare() {
+  cat > "${pkgname}" <<EOF
+#!/usr/bin/env bash
+exec electron /usr/share/${pkgname} "\$@"
+EOF
+  gendesk \
+    --pkgname "${pkgname}" \
+    --pkgdesc "${pkgdesc}" \
+    --name "${_name}" \
+    --categories "Network;Office;Calendar;" \
+    -n \
+    -f
+}
 
 build() {
-    nativefier "https://calendar.google.com/" \
-      --icon $pkgname.png \
-      --maximize \
-      --name $_instname \
-      --user-agent "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:70.0) Gecko/20100101 Firefox/70.0" \
-      --internal-urls "(.*?calendar\.google\.com.*?|.*?accounts\.google\.com.*?)" \
-      --single-instance \
-      --inject $pkgname.js
+  cd "${srcdir}"
+  # https://github.com/nativefier/nativefier/issues/831
+  nativefier \
+    --name "${_name}" \
+    --icon "${pkgname}.png" \
+    --maximize \
+    --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:86.0) Gecko/20100101 Firefox/87.0" \
+    --single-instance \
+    --verbose \
+    --inject "${pkgname}.js" \
+    https://calendar.google.com
 }
 
 package() {
-    install -d "$pkgdir"/opt "$pkgdir"/usr/{bin,share/pixmaps}
-    install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$_instname.desktop
-
-    cp -rL $_instname-linux-* "$pkgdir"/opt/$pkgname
-    ln -sf /opt/$pkgname/$_instname "$pkgdir"/usr/bin/$_instname
-    ln -sf /opt/$pkgname/resources/app/icon.png "$pkgdir"/usr/share/pixmaps/$_instname.png
-
-    chmod 666 "$pkgdir"/opt/$pkgname/resources/app/nativefier.json
+  mkdir -p "${pkgdir}/usr/share"
+  local _x=`echo "${_name// /}-linux-"*`
+  cp -r "${_x}/resources/app" "${pkgdir}/usr/share/${pkgname}"
+  install -Dm 755 -t "${pkgdir}/usr/bin/" "${pkgname}"
+  install -Dm 644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop"
+  install -Dm 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${_x}/LICENSE"
+  install -Dm 644 -t "${pkgdir}/usr/share/pixmaps/" "${pkgname}.png"
 }
-
diff --git a/google-calendar-nativefier-dark.desktop b/google-calendar-nativefier-dark.desktop
deleted file mode 100644
index 46658df64367..000000000000
--- a/google-calendar-nativefier-dark.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Google Calendar
-Comment=The Google Calendar app helps you spend less time managing your schedule and more time enjoying it.
-Exec=google-calendar-dark
-Icon=/usr/share/pixmaps/google-calendar-dark.png
-Terminal=false
-Categories=Productivity;Calendar;Google;Nativefier;