switch to source tarball, use more quotes

1 files changed, 24 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 352b88a11352..1e78e570bbe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=zettlr
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A markdown editor for writing academic texts and taking notes"
 arch=('x86_64')
 url='https://www.zettlr.com'
@@ -12,11 +12,15 @@ makedepends=(yarn git)
 optdepends=('pandoc: For exporting to various format'
             'texlive-bin: For Latex support'
             'ttf-lato: Display output in a more comfortable way')
-source=("$pkgname"::git+https://github.com/Zettlr/Zettlr.git#tag=v"$pkgver")
-sha1sums=('SKIP')
+#source lines for git fans
+#source=("${pkgname}"::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')
 
 prepare() {
-    cd "$srcdir/$pkgname"
+    cd "${srcdir}/Zettlr-${pkgver}"
 
     # We don't build electron and friends, and don't depends on postinstall script
     sed '/^\s*\"electron.*$/d;/postinstall/d' -i package.json
@@ -29,17 +33,17 @@ prepare() {
 }
 
 build() {
-    cd "$srcdir/$pkgname"
+    cd "${srcdir}/Zettlr-${pkgver}"
     local NODE_ENV=''
-    yarn install --pure-lockfile --no-bin-links --cache-folder "$srcdir/cache" --link-folder "$srcdir/link"
+    yarn install --pure-lockfile --no-bin-links --cache-folder "${srcdir}/cache" --link-folder "${srcdir}/link"
     yarn less
     yarn handlebars
     yarn lang:refresh
     NODE_ENV=production node node_modules/webpack/bin/webpack.js
     yarn reveal:build
 
-    cd "$srcdir/$pkgname/source"
-    yarn install --pure-lockfile --cache-folder "$srcdir/cache"
+    cd "${srcdir}/Zettlr-${pkgver}/source"
+    yarn install --pure-lockfile --cache-folder "${srcdir}/cache"
 
     # Aggressively remove binary and addins in node_modules
     find . -type d -name "fonts" -exec rm -rfv {} +
@@ -59,36 +63,33 @@ build() {
 }
 
 package() {
-    local _destdir=usr/lib/"$pkgname"
-    install -dm755 "$pkgdir/$_destdir"
+    local _destdir=usr/lib/"${pkgname}"
+    install -dm755 "${pkgdir}/${_destdir}"
 
-    cd "$srcdir/$pkgname/source"
-    sed "s,$srcdir/$pkgname/source,$_destdir,g" -i renderer/assets/vue/vue-sidebar.js
-    cp -r --no-preserve=ownership --preserve=mode ./* "$pkgdir/$_destdir/"
+    cd "${srcdir}/Zettlr-${pkgver}/source"
+    sed "s,${srcdir}/Zettlr-${pkgver}/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
+    install -Dm755 /dev/stdin "${pkgdir}/usr/bin/${pkgname}" <<END
 #!/bin/sh
-exec electron /$_destdir "\$@"
+exec electron /${_destdir} "\$@"
 END
 
+    # install icons of vary sizes to hi-color theme
     for px in 16 24 32 48 64 96 128 256 512; do
-        # cp linux icons to where electron desires
-        install -Dm644 "${srcdir}/${pkgname}/resources/icons/png/${px}x${px}.png" \
-            "$pkgdir/$_destdir/resources/icons/png/${px}x${px}.png"
+        install -Dm644 "${srcdir}/Zettlr-${pkgver}/resources/icons/png/${px}x${px}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${px}x${px}/apps/${pkgname}.png"
     done
 
     # generate freedesktop entry files
-    install -Dm644 "${srcdir}/${pkgname}/resources/icons/png/512x512.png" \
-        "$pkgdir"/usr/share/icons/hicolor/"$px"x"$px"/apps/"$pkgname".png
-
     install -Dm644 /dev/stdin "${pkgdir}/usr/share/applications/${pkgname}.desktop" <<END
 [Desktop Entry]
 Name=Zettlr
 Comment=A powerful Markdown Editor with integrated tree view
-Exec=$pkgname %U
+Exec=${pkgname} %U
 Terminal=false
 Type=Application
-Icon=$pkgname
+Icon=${pkgname}
 StartupWMClass=Zettlr
 MimeType=text/markdown;
 Categories=Office;