updpkg 1.8.0, replace downloads to source

1 files changed, 53 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0e063e363bb0..c08fbb962023 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,78 @@
 # Maintainer: BrLi <brli at chakralinux dot org>
 
 pkgname=zettlr
-pkgver=1.7.5
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="A markdown editor for writing academic texts and taking notes"
 arch=('x86_64')
 url='https://www.zettlr.com'
 license=('GPL' 'custom') # Noted that the icon and name are copyrighted
-depends=(electron9 ttf-webhostinghub-glyphs otf-crimson-text)
-makedepends=(yarn git gulp)
+depends=(electron ttf-webhostinghub-glyphs otf-crimson-text)
+makedepends=(yarn git gulp electron-forge)
 optdepends=('pandoc: For exporting to various format'
             'texlive-bin: For Latex support'
             'ttf-lato: Display output in a more comfortable way')
-_commit=0c4a2c21ca08464127dcc11dedf9117eb57b7bac # v1.7.5^0
-source=(git+https://github.com/Zettlr/Zettlr.git#commit="${_commit}")
-sha1sums=('SKIP')
+options=('!strip')
+_commit=b7165b4c3e69cec8c62b7203df41fcbeb91d178d # 1.8.0^0
+_lang=('de-DE' 'en-GB' 'en-US' 'fr-FR' 'ja-JP' 'zh-CN' 'es-ES' 'ru-RU')
+source=(git+https://github.com/Zettlr/Zettlr.git#commit="${_commit}"
+        # citation style
+        https://github.com/citation-style-language/locales/archive/master.zip
+        https://raw.githubusercontent.com/citation-style-language/styles/master/chicago-author-date.csl)
+        # translations
+for _l in ${_lang[@]}; do
+    source+=(https://translate.zettlr.com/download/${_l}.json)
+done
+sha256sums=('SKIP'
+            '4a3b89033d6bbb669a7d046d23224dc3eaaa2840cc8a5dd2c5d6201a61e3f1a1'
+            '2b7cd6c1c9be4add8c660fb9c6ca54f1b6c3c4f49d6ed9fa39c9f9b10fcca6f4'
+            '192b9db172cbc2f1e9e1c5f7aee4757f1ef960c851561c001fe877b92bf2fff2'
+            '71bd0c5462dc7dbcc38e7d6f31eb7d0cfe7cfcb1291ce3d670da43195c98a460'
+            'b7583049214837ae023495dc1264089f8f43c22d788b66ef2c31fadfcf911b19'
+            'ccfd645e08d8cb25acd867209773305dd29a224e0496b5c4f1412651e1406406'
+            '8c9a649286d4b7cb90c9481408de10ae6a1ae103340b46d1c10e7bfa4defd188'
+            '1e6f2fa86679f1bbdb669acbc079b5b468a355ba1827f4ff8e81cba6148dc114'
+            '8729104501d29682171c91cf8f095fa52967ef061dbaf7390fd57be88bd507bd'
+            'c03aee051a159c32ad44ac6ead384343a0850112ba95663da2b390fd115806a4')
 
 prepare() {
     cd "${srcdir}/Zettlr"
 
     # We don't build electron and friends, and don't depends on postinstall script
-    sed '/^\s*\"electron.*$/d;/postinstall/d' -i package.json
+    sed '/^\s*\"electron-notarize.*$/d;/^\s*\"electron-builder.*$/d;/postinstall/d' -i package.json
+    sed 's/\^10.1.5/10.1.5/' -i package.json
+
+    # lang:refresh from package.json
+    for _l in ${_lang[@]}; do
+        cp "${srcdir}/${_l}.json" source/common/lang/
+    done
+
+    # csl:refresh from package.json
+    cp $(find "${srcdir}/locales-master/" -name "*.xml") source/app/service-providers/assets/csl-locales/
+    cp "${srcdir}/locales-master/locales.json" source/app/service-providers/assets/csl-locales/
+    cp "${srcdir}/chicago-author-date.csl" source/app/service-providers/assets/csl-styles/
 
-    # Add some close-to-complete translations
-    sed "s/'fr-FR'/'fr-FR','ja-JP','zh-CN','es-ES','ru-RU'/" -i scripts/refresh-language.js
 }
 
 build() {
     cd "${srcdir}/Zettlr"
     local NODE_ENV=''
     yarn install --pure-lockfile \
-                 --no-bin-links \
                  --cache-folder "${srcdir}/cache" \
                  --link-folder "${srcdir}/link" \
                  --ignore-scripts
-    yarn less
-    yarn handlebars
-    yarn lang:refresh
     yarn reveal:build
-    NODE_ENV=production node node_modules/webpack/bin/webpack.js --progress --colors
 
     cd "${srcdir}/Zettlr/source"
     yarn install --pure-lockfile --cache-folder "${srcdir}/cache"
 
-    # Aggressively remove binary and useless files in node_modules
+    cd "${srcdir}/Zettlr"
+    electron-forge make || true # always failed anyway, we just want the outcome .webpack directory
+
+    cd "${srcdir}/Zettlr/.webpack"
+
+    # remove fonts
     find . -type d -name "fonts" -exec rm -rfv {} +
-    find . -iname "CHANGELOG*" -exec rm -rfv {} +
-    find . -iname "README*" -exec rm -rfv {} +
-    find . -iname "*.md" -exec rm -rfv {} +
-    find . -iname "*test*" -exec rm -rfv {} +
-    find . -iname "license*" -exec rm -rfv {} +
-    find . -iname ".*" -exec rm -rfv {} + || true
-    find . -name "yarn.lock" -exec rm -rfv {} +
 }
 
 # check() {
@@ -72,14 +93,15 @@ package() {
     local _destdir=usr/lib/"${pkgname}"
     install -dm755 "${pkgdir}/${_destdir}"
 
-    cd "${srcdir}/Zettlr/source"  
-    # Fix pacman warning about reference to $srcdir
-    sed "s,${srcdir}/Zettlr/source,${_destdir},g" -i renderer/assets/vue/vue-sidebar.js
-    cp -r --no-preserve=ownership --preserve=mode ./* "${pkgdir}/${_destdir}/"
+    cd "${srcdir}/Zettlr"
+
+    # only copy the critical parts
+    cp -r --no-preserve=ownership --preserve=mode ./package.json "${pkgdir}/${_destdir}/"
+    cp -r --no-preserve=ownership --preserve=mode ./.webpack "${pkgdir}/${_destdir}/"
 
     install -Dm755 /dev/stdin "${pkgdir}/usr/bin/${pkgname}" <<END
 #!/bin/sh
-exec electron9 /${_destdir} "\$@"
+exec electron /${_destdir} "\$@"
 END
 
     # install icons of various sizes to hi-color theme
@@ -88,10 +110,6 @@ END
             "${pkgdir}/usr/share/icons/hicolor/${px}x${px}/apps/${pkgname}.png"
     done
 
-    # install legal notice
-    install -Dm644 "${srcdir}/Zettlr/README.md" "${pkgdir}/usr/share/licenses/${pkgname}/README"
-    install -Dm644 "${srcdir}/Zettlr/resources/icons/README.md" "${pkgdir}/usr/share/licenses/${pkgname}/icon/README"
-
     # generate freedesktop entry files
     install -Dm644 /dev/stdin "${pkgdir}/usr/share/applications/${pkgname}.desktop" <<END
 [Desktop Entry]
@@ -105,4 +123,7 @@ StartupWMClass=Zettlr
 MimeType=text/markdown;
 Categories=Office;
 END
+
+    # license
+    install -Dm644 "${srcdir}/Zettlr/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }