From 3621ce8bdbbaa771191f96bd095bc6e820e72ca1 Mon Sep 17 00:00:00 2001
From: windowsboy111 <wboy111@outlook.com>
Date: Wed, 18 Jan 2023 18:32:18 +0800
Subject: [PATCH] Fix openasar

---
 .../anda.hcl                                  |  2 +-
 .../discord-canary-openasar.spec              | 55 +++++++++++++++++++
 .../update.rhai                               |  3 +
 .../apps/openasar-canary/openasar-canary.spec | 41 --------------
 4 files changed, 59 insertions(+), 42 deletions(-)
 rename anda/apps/{openasar-canary => discord-canary-openasar}/anda.hcl (54%)
 create mode 100644 anda/apps/discord-canary-openasar/discord-canary-openasar.spec
 rename anda/apps/{openasar-canary => discord-canary-openasar}/update.rhai (68%)
 delete mode 100644 anda/apps/openasar-canary/openasar-canary.spec

diff --git a/anda/apps/openasar-canary/anda.hcl b/anda/apps/discord-canary-openasar/anda.hcl
similarity index 54%
rename from anda/apps/openasar-canary/anda.hcl
rename to anda/apps/discord-canary-openasar/anda.hcl
index 96fe647a6b..dff3753b5c 100644
--- a/anda/apps/openasar-canary/anda.hcl
+++ b/anda/apps/discord-canary-openasar/anda.hcl
@@ -1,6 +1,6 @@
 project "pkg" {
     rpm {
-        spec = "openasar-canary.spec"
+        spec = "discord-canary-openasar.spec"
         update = ""
     }
 }
diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec
new file mode 100644
index 0000000000..232c71d1ed
--- /dev/null
+++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec
@@ -0,0 +1,55 @@
+%define debug_package %{nil}
+%define commit 40b27dd1b8dd48277207db1b165c220c3441484c
+
+Name:           openasar-canary
+Version:        0.0.146
+Release:        1%{?dist}
+Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+License:        MIT and https://discord.com/terms
+URL:            https://github.com/GooseMod/OpenAsar
+Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
+Source1:        %{url}/releases/download/nightly/app.asar
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+ExclusiveArch:  x86_64
+
+%description
+%{summary}.
+
+%prep
+%autosetup -n DiscordCanary
+
+
+%build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
+cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
+mkdir -p %{buildroot}%{_datadir}/applications/
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
+install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
+cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-canary-openasar/app.asar
+
+
+# trigger on discord-canary
+%triggerin -- discord-canary
+cp %{_datadir}/openasar-canary/app.asar %{_datadir}/discord-canary/resources/app.asar
+
+
+
+%files
+%{_datadir}/discord-canary-openasar/
+%{_datadir}/applications/discord-canary-openasar.desktop
+%{_datadir}/pixmaps/discord-canary-openasar.png
+
+
+%changelog
+* Wed Jan 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 0.0.146-1
+- Renamed from openasar-canary to discord-canary-openasar
+- Fix issues after removing discord-canary package
+- Bundle discord-canary
+
+* Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
+- 
diff --git a/anda/apps/openasar-canary/update.rhai b/anda/apps/discord-canary-openasar/update.rhai
similarity index 68%
rename from anda/apps/openasar-canary/update.rhai
rename to anda/apps/discord-canary-openasar/update.rhai
index 8efb397ee3..6f53c55c7e 100644
--- a/anda/apps/openasar-canary/update.rhai
+++ b/anda/apps/discord-canary-openasar/update.rhai
@@ -9,3 +9,6 @@ if sha != cur {
 } else {
     print("openasar-canary: Up to date!");
 }
+let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz");
+let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
diff --git a/anda/apps/openasar-canary/openasar-canary.spec b/anda/apps/openasar-canary/openasar-canary.spec
deleted file mode 100644
index 1b003ed562..0000000000
--- a/anda/apps/openasar-canary/openasar-canary.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-%define commit 40b27dd1b8dd48277207db1b165c220c3441484c
-
-Name:           openasar-canary
-Version:        nightly.%{autogitdate}
-Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
-
-License:        MIT
-URL:            https://github.com/GooseMod/OpenAsar
-Source0:        %{url}/releases/download/nightly/app.asar
-
-Requires:       discord-canary
-
-%description
-%{summary}.
-
-%prep
-
-
-%build
-
-
-%install
-mkdir -p %{buildroot}%{_datadir}/openasar-canary
-cp -v %{SOURCE0} %{buildroot}%{_datadir}/openasar-canary/app.asar
-
-
-# trigger on discord-canary
-%triggerin -- discord-canary
-cp %{_datadir}/openasar-canary/app.asar %{_datadir}/discord-canary/resources/app.asar
-
-
-
-%files
-%{_datadir}/openasar-canary/app.asar
-
-
-
-%changelog
-* Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
--