From 6c9d1db48cb07531a56938fd10ec42dd4c7b64c6 Mon Sep 17 00:00:00 2001
From: aunetx <aunetx@yandex.com>
Date: Wed, 13 Oct 2021 00:53:38 +0200
Subject: [PATCH] Move json append to new file

---
 Makefile            | 66 +++++++++------------------------------------
 package-append.json | 37 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 53 deletions(-)
 create mode 100644 package-append.json

diff --git a/Makefile b/Makefile
index 74d838a..f700a17 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,9 @@
 # Maintainer: Aurélien Hamy <aunetx@yandex.com>
 
-PKGNAME = deezer
+APPNAME = dev.aunetx.deezer
 PKGVER = 5.30.0
 BASE_URL = https://www.deezer.com/desktop/download/artifact/win32/x86/$(PKGVER)
-EXE_NAME = $(PKGNAME)-$(PKGVER)-setup.exe
-
-pkg_json_append = '},\
-  "scripts": {\
-	"dist": "electron-builder",\
-	"start": "electron ."\
-  },\
-  "devDependencies": {\
-    "electron": "^13.5.1",\
-	"electron-builder": "^22.13.1"\
-  },\
-  "build": {\
-  	"files": [\
-      "**"\
-    ],\
-    "directories": {\
-      "buildResources": "build"\
-    },\
-    "extraResources": [\
-      {\
-        "from": "../extra/",\
-        "to": ".",\
-        "filter": [\
-          "**"\
-        ]\
-      }\
-    ],\
-    "linux": {\
-      "maintainer": "aunetx <me@aunetx.dev>",\
-      "icon": "../icons",\
-      "category": "Utility;AudioVideo;Audio;Player;Music;",\
-      "desktop": {\
-        "Name": "Deezer",\
-        "Type": "Application",\
-        "GenericName": "Online music streaming service",\
-        "Comment": "Listen and download all your favorite music",\
-        "MimeType": "x-scheme-handler/deezer;",\
-        "Keywords": "Music;Player;Streaming;Online;"\
-      }\
-    }\
-  }\
-}'
+GPG_KEY_ID = 5A7D3B06F15FB60238941027EB3A799E7EE716EB
 
 
 install_build_deps:
@@ -54,9 +13,9 @@ install_build_deps:
 prepare: install_build_deps
 	mkdir -p source
 	# Download installer
-	wget -c $(BASE_URL) -O source/$(EXE_NAME)
+	wget -c $(BASE_URL) -O source/deezer-setup.exe
 	# Extract app archive from installer
-	cd source && 7z x -so $(EXE_NAME) '$$PLUGINSDIR/app-32.7z' > app-32.7z
+	cd source && 7z x -so deezer-setup.exe '$$PLUGINSDIR/app-32.7z' > app-32.7z
 	# Extract app from app archive
 	cd source && 7z x -y -bsp0 -bso0 app-32.7z
 	# Extract app sources from the app
@@ -70,32 +29,33 @@ prepare: install_build_deps
 	# Start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12)
 	$(foreach p, $(wildcard ./patches/*), patch -p1 -dapp < $(p);)
 
-	# Append `pkg_json_append` to the `package.json` of the app
+	# Append `package-append.json` to the `package.json` of the app
 	# Adds electron, elecron-builder dependencies, and build directives
-	head -n -2 app/package.json > tmp.txt && mv tmp.txt app/package.json
-	echo  $(pkg_json_append) | tee -a app/package.json
+	head -n -1 app/package.json > tmp.txt && mv tmp.txt app/package.json
+	cat package-append.json | tee -a app/package.json
 
 prepare_flatpak: prepare
 	# Generate npm sources (without installing them)
 	npm i --prefix=app --package-lock-only
 	# Package the sources to use them in flatpak-builder offline
+	mkdir -p flatpak
 	./flatpak-node-generator.py npm app/package-lock.json -o flatpak/generated-sources.json --electron-node-headers --xdg-layout
 
 build_flatpak: prepare_flatpak
 	# Build the flatpak image
-	flatpak-builder --force-clean build dev.aunetx.deezer.yml
+	flatpak-builder --force-clean --state-dir=flatpak/flatpak-builder flatpak/build $(APPNAME).yml
 
 export_flatpak: prepare_flatpak
 	# Build the flatpak package and export it to the repo
-	flatpak-builder --gpg-sign=5A7D3B06F15FB60238941027EB3A799E7EE716EB --repo=repo --force-clean build dev.aunetx.deezer.yml
+	flatpak-builder --gpg-sign=$(GPG_KEY_ID) --repo=flatpak/repo --state-dir=flatpak/flatpak-builder --force-clean flatpak/build $(APPNAME).yml
 
 flatpak_bundle: build_flatpak
 	# Create a flatpak bundle
-	flatpak build-bundle --gpg-sign=5A7D3B06F15FB60238941027EB3A799E7EE716EB flatpak/repo deezer.flatpak dev.aunetx.deezer
+	flatpak build-bundle --gpg-sign=$(GPG_KEY_ID) --state-dir=flatpak/flatpak-builder flatpak/repo deezer.flatpak $(APPNAME)
 
 install_flatpak: prepare_flatpak
 	# Build and install locally the flatpak image
-	flatpak-builder --force-clean --user --install build dev.aunetx.deezer.yml
+	flatpak-builder --force-clean --state-dir=flatpak/flatpak-builder --user --install flatpak/build $(APPNAME).yml
 
 build_appimage: prepare
 	# Install required dependencies to pack them with AppImage
@@ -104,7 +64,7 @@ build_appimage: prepare
 	npm run dist --prefix=app
 
 run_flatpak:
-	flatpak run dev.aunetx.deezer
+	flatpak run $(APPNAME)
 
 clean:
 	rm -rf app flatpak node_modules source package-lock.json
\ No newline at end of file
diff --git a/package-append.json b/package-append.json
new file mode 100644
index 0000000..788f474
--- /dev/null
+++ b/package-append.json
@@ -0,0 +1,37 @@
+ ,"scripts": {
+    "dist": "electron-builder",
+    "start": "electron ."
+  },
+  "devDependencies": {
+    "electron": "^13.5.1",
+    "electron-builder": "^22.13.1"
+  },
+  "build": {
+    "files": [
+      "**"
+    ],
+    "directories": {
+      "buildResources": "build"
+    },
+    "extraResources": [
+      {
+        "from": "../extra/",
+        "to": ".",
+        "filter": ["**"]
+      }
+    ],
+    "linux": {
+      "maintainer": "aunetx <me@aunetx.dev>",
+      "icon": "../icons",
+      "category": "Utility;AudioVideo;Audio;Player;Music;",
+      "desktop": {
+        "Name": "Deezer",
+        "Type": "Application",
+        "GenericName": "Online music streaming service",
+        "Comment": "Listen and download all your favorite music",
+        "MimeType": "x-scheme-handler/deezer;",
+        "Keywords": "Music;Player;Streaming;Online;"
+      }
+    }
+  }
+}
\ No newline at end of file