From 8b725cc497ef6d28819575bff39e8e0614245b7a Mon Sep 17 00:00:00 2001
From: tinywrkb <tinywrkb@gmail.com>
Date: Sun, 27 Dec 2020 13:45:30 +0200
Subject: [PATCH] boolr: move away from extra-data

---
 me.boolr.boolr/me.boolr.boolr.yaml | 17 ++++++-----------
 me.boolr.boolr/resources/boolr     |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/me.boolr.boolr/me.boolr.boolr.yaml b/me.boolr.boolr/me.boolr.boolr.yaml
index f8d36f31..e9ea912b 100644
--- a/me.boolr.boolr/me.boolr.boolr.yaml
+++ b/me.boolr.boolr/me.boolr.boolr.yaml
@@ -71,22 +71,17 @@ modules:
   - name: boolr
     buildsystem: simple
     build-commands:
-      - install -D apply_extra /app/bin/apply_extra
       - install -Dm755 boolr /app/bin/boolr
       - install -Dm644 me.boolr.boolr.desktop -t /app/share/applications/
       - install -Dm644 me.boolr.boolr.png -t /app/share/icons/hicolor/128x128/apps/
+      - rm -f boolr.dir/boolr.desktop
+      - sed -i 's#^\(const savesFolder =\).*#\1 process.env.XDG_CONFIG_HOME + "/BOOLR/saves/";\nif (!fs.existsSync(savesFolder)) fs.mkdir(savesFolder);#' boolr.dir/resources/app/app/js/saves.js
+      - install -d /app/lib/
+      - mv boolr.dir /app/lib/boolr
     sources:
-      - type: script
-        dest-filename: apply_extra
-        commands:
-          - bsdtar -xf boolr.zip --strip-components=1
-          - rm -f boolr.zip
-          - rm -f boolr.desktop
-          - sed -i 's#^\(const savesFolder =\).*#\1 process.env.XDG_CONFIG_HOME + "/BOOLR/saves/";\nif (!fs.existsSync(savesFolder)) fs.mkdir(savesFolder);#' resources/app/app/js/saves.js
-      - type: extra-data
-        filename: boolr.zip
+      - type: archive
         url: https://github.com/GGBRW/BOOLR/releases/download/v1.0.3/BOOLR-v1.0.3-linux-x86_64.zip
         sha256: 94fa88d65442687aa6aa4ac2d3f5a0c76ed13d45adf98bcc6609f3118c90bb29
-        size: 48267385
+        dest: boolr.dir
       - type: dir
         path: resources
diff --git a/me.boolr.boolr/resources/boolr b/me.boolr.boolr/resources/boolr
index b4d92a08..60ee3191 100644
--- a/me.boolr.boolr/resources/boolr
+++ b/me.boolr.boolr/resources/boolr
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /app/extra/BOOLR "$@"
+exec /app/lib/boolr/BOOLR "$@"