updpkg

1 files changed, 13 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1e78e570bbe5..e1de76af7ec3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,35 @@
 # Maintainer: BrLi <brli at chakralinux dot org>
 
 pkgname=zettlr
-pkgver=1.6.0
-pkgrel=4
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="A markdown editor for writing academic texts and taking notes"
 arch=('x86_64')
 url='https://www.zettlr.com'
 license=('GPL')
 depends=(electron ttf-webhostinghub-glyphs otf-crimson-text)
-makedepends=(yarn git)
+makedepends=(yarn git gulp)
 optdepends=('pandoc: For exporting to various format'
             'texlive-bin: For Latex support'
             'ttf-lato: Display output in a more comfortable way')
-#source lines for git fans
-#source=("${pkgname}"::git+https://github.com/Zettlr/Zettlr.git#tag=v"$pkgver")
-#sha1sums=('SKIP')
+source=(git+https://github.com/Zettlr/Zettlr.git#tag=v"${pkgver}")
+sha1sums=('SKIP')
 
-source=(https://github.com/Zettlr/Zettlr/archive/v${pkgver}.tar.gz)
-sha256sums=('765c9d74a7d9a6a35df88cb6ca23db7e88409e32d0c9cbf4b234cc47d8d69b39')
+# source=(https://github.com/Zettlr/Zettlr/archive/v${pkgver}.tar.gz)
+# sha256sums=('765c9d74a7d9a6a35df88cb6ca23db7e88409e32d0c9cbf4b234cc47d8d69b39')
 
 prepare() {
-    cd "${srcdir}/Zettlr-${pkgver}"
+    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
 
     # 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
-
-    # Do not specify icon explicitly in window.js
-    sed '/^\s*icon.*$/d' -i source/main/zettlr-window.js
 }
 
 build() {
-    cd "${srcdir}/Zettlr-${pkgver}"
+    cd "${srcdir}/Zettlr"
     local NODE_ENV=''
     yarn install --pure-lockfile --no-bin-links --cache-folder "${srcdir}/cache" --link-folder "${srcdir}/link"
     yarn less
@@ -42,7 +38,7 @@ build() {
     NODE_ENV=production node node_modules/webpack/bin/webpack.js
     yarn reveal:build
 
-    cd "${srcdir}/Zettlr-${pkgver}/source"
+    cd "${srcdir}/Zettlr/source"
     yarn install --pure-lockfile --cache-folder "${srcdir}/cache"
 
     # Aggressively remove binary and addins in node_modules
@@ -66,8 +62,8 @@ package() {
     local _destdir=usr/lib/"${pkgname}"
     install -dm755 "${pkgdir}/${_destdir}"
 
-    cd "${srcdir}/Zettlr-${pkgver}/source"
-    sed "s,${srcdir}/Zettlr-${pkgver}/source,${_destdir},g" -i renderer/assets/vue/vue-sidebar.js
+    cd "${srcdir}/Zettlr/source"
+    sed "s,${srcdir}/Zettlr/source,${_destdir},g" -i renderer/assets/vue/vue-sidebar.js
     cp -r --no-preserve=ownership --preserve=mode ./* "${pkgdir}/${_destdir}/"
 
     install -Dm755 /dev/stdin "${pkgdir}/usr/bin/${pkgname}" <<END
@@ -77,7 +73,7 @@ END
 
     # install icons of vary sizes to hi-color theme
     for px in 16 24 32 48 64 96 128 256 512; do
-        install -Dm644 "${srcdir}/Zettlr-${pkgver}/resources/icons/png/${px}x${px}.png" \
+        install -Dm644 "${srcdir}/Zettlr/resources/icons/png/${px}x${px}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${px}x${px}/apps/${pkgname}.png"
     done