From d3d167e62896fe68ed785d27dcb12556f52dec10 Mon Sep 17 00:00:00 2001
From: Marko Semet <marko10_000@gmx.de>
Date: Sun, 6 Dec 2020 19:57:57 +0100
Subject: [PATCH] Update Zettlr to version 1.8.1

---
 com.zettlr.Zettlr/com.zettlr.Zettlr.yaml | 19 +++++++++++++++----
 com.zettlr.Zettlr/zettlr.appdata.xml     |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/com.zettlr.Zettlr/com.zettlr.Zettlr.yaml b/com.zettlr.Zettlr/com.zettlr.Zettlr.yaml
index 0661718..43e8530 100644
--- a/com.zettlr.Zettlr/com.zettlr.Zettlr.yaml
+++ b/com.zettlr.Zettlr/com.zettlr.Zettlr.yaml
@@ -26,6 +26,7 @@ modules:
                 sha256: a1120472bf55aea745287693a6651e16973e1008c9d6107df350126adf9716fe
         cleanup:
             - /include
+            - "*"
     -   name: yarn
         sources:
             -   type: file
@@ -35,30 +36,40 @@ modules:
         build-commands:
             - cp yarn-1.22.10.js /app/bin/yarn
             - chmod +x /app/bin/yarn
+        cleanup:
+            - "*"
     -   name: zettlr
         buildsystem: simple
         sources:
             -   type: archive
-                url: https://github.com/Zettlr/Zettlr/archive/v1.8.0.tar.gz
-                sha256: e1f3039ad08e7b774a3bb8f60d4e14fa19eba0e48f56b647ddf5952730ccbf10
+                url: https://github.com/Zettlr/Zettlr/archive/v1.8.1.tar.gz
+                sha256: d774720229da04923ff35584f4420cbbe04540cc18bedeff7da872fd2f6a5d4b
                 dest: zettlr
             - ./sources.json
             -   type: shell
                 commands:
                     - export DIR_NAME=httpsgithub.comelectronelectronreleasesdownloadv10.1.5electron-v10.1.5-linux-x64.zip && (cd flatpak-node/electron-cache && mkdir -p "$DIR_NAME" && ln -s "../$(ls . | grep '^electron-')" "$DIR_NAME/")
+                    - export DIR_NAME=v10.1.5 && (cd flatpak-node/electron-cache && mkdir -p "$DIR_NAME" && ln -s "../$(ls . | grep '^electron-')" "$DIR_NAME/")
+                    - export DIR_NAME=v10.1.5 && (cd flatpak-node/electron-cache && mkdir -p "$DIR_NAME" && ln -s "../$(ls . | grep '^SHA')" "$DIR_NAME/SHASUMS256.txt")
         build-commands:
             - yarn --offline config set yarn-offline-mirror "$(pwd)/flatpak-node/yarn-mirror" &&
               export electron_config_cache="$(pwd)"/flatpak-node/electron-cache &&
               cd zettlr &&
               yarn --offline install &&
-              yarn --offline package
+              sed -i 's|https://github.com/electron/electron/releases/download/|http://127.0.0.1:8080/|' node_modules/@electron/get/dist/cjs/artifact-utils.js
+            - (cd flatpak-node/electron-cache && python3 -m http.server 8080) &
+              TO_KILL="$!" &&
+              sleep 5 &&
+              cd zettlr &&
+              yarn --offline package &&
+              kill "$TO_KILL"
             - cp -ra zettlr/out/* /app/zettlr
     -   name: starter
         sources:
             -   type: script
                 dest-filename: run.sh
                 commands:
-                    - exec yarn --cwd /app/zettlr start --no-sandbox
+                    - exec /app/zettlr/Zettlr --no-sandbox
             -   type: file
                 path: zettlr.appdata.xml
             -   type: file
diff --git a/com.zettlr.Zettlr/zettlr.appdata.xml b/com.zettlr.Zettlr/zettlr.appdata.xml
index 372da9b..0c4be11 100644
--- a/com.zettlr.Zettlr/zettlr.appdata.xml
+++ b/com.zettlr.Zettlr/zettlr.appdata.xml
@@ -14,6 +14,7 @@
         <category>WordProcessor</category>
     </categories>
     <releases>
+        <release version="1.8.1" date="2020-12-04" />
         <release version="1.8.0" date="2020-11-27" />
         <release version="1.7.5" date="2020-08-18" />
         <release version="1.7.4" date="2020-08-01" />