diff --git a/anda/desktops/elementary/pantheon-session-settings/anda.hcl b/anda/desktops/elementary/pantheon-session-settings/anda.hcl index bf4a627543..7bc02d9917 100644 --- a/anda/desktops/elementary/pantheon-session-settings/anda.hcl +++ b/anda/desktops/elementary/pantheon-session-settings/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "pantheon-session-settings.spec" - update = "" } } diff --git a/anda/discord-canary/update.rhai b/anda/discord-canary/update.rhai index f08ae6ec42..d96b864947 100644 --- a/anda/discord-canary/update.rhai +++ b/anda/discord-canary/update.rhai @@ -1,3 +1,3 @@ let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz"); -let newver = str(find("https://dl-canary\.discordapp\.net/apps/linux/([\.\d]+)/", html, 1) @ 0); -rpm.version(newver); \ No newline at end of file +let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1); +rpm.version(newver); diff --git a/anda/discord-ptb/update.rhai b/anda/discord-ptb/update.rhai index 79b2837807..32e9b4a735 100644 --- a/anda/discord-ptb/update.rhai +++ b/anda/discord-ptb/update.rhai @@ -1,3 +1,3 @@ let html = get("https://discordapp.com/api/download/ptb?platform=linux&format=tar.gz"); -let newver = str(find("https://dl-ptb\.discordapp\.net/apps/linux/([\.\d]+)/", html, 1) @ 0); -rpm.version(newver); \ No newline at end of file +let newver = find("https://dl-ptb\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1); +rpm.version(newver); diff --git a/anda/fonts/arphic-ukai/anda.hcl b/anda/fonts/arphic-ukai/anda.hcl index 54bcaeeaad..f402788194 100644 --- a/anda/fonts/arphic-ukai/anda.hcl +++ b/anda/fonts/arphic-ukai/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "arphic-ukai-fonts.spec" - update = "" } } diff --git a/anda/fonts/arphic-uming/anda.hcl b/anda/fonts/arphic-uming/anda.hcl index 66027fca62..af7015ea61 100644 --- a/anda/fonts/arphic-uming/anda.hcl +++ b/anda/fonts/arphic-uming/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "arphic-uming-fonts.spec" - update = "" } } diff --git a/anda/fonts/hannom/anda.hcl b/anda/fonts/hannom/anda.hcl index 492478128e..5e46f056d1 100644 --- a/anda/fonts/hannom/anda.hcl +++ b/anda/fonts/hannom/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "hannom-fonts.spec" - update = "" } } diff --git a/anda/fonts/kanjistrokeorders/anda.hcl b/anda/fonts/kanjistrokeorders/anda.hcl index 8c1a647121..41529b2850 100644 --- a/anda/fonts/kanjistrokeorders/anda.hcl +++ b/anda/fonts/kanjistrokeorders/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "kanjistrokeorders-fonts.spec" - update = "" } } diff --git a/anda/fonts/mini-wakuwaku/anda.hcl b/anda/fonts/mini-wakuwaku/anda.hcl index 908a639029..8415e7c049 100644 --- a/anda/fonts/mini-wakuwaku/anda.hcl +++ b/anda/fonts/mini-wakuwaku/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "mini-wakuwaku-fonts.spec" - update = "" } } diff --git a/anda/fonts/seto/anda.hcl b/anda/fonts/seto/anda.hcl index b1079518ab..9eb54581ee 100644 --- a/anda/fonts/seto/anda.hcl +++ b/anda/fonts/seto/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "seto-fonts.spec" - update = "" } } diff --git a/anda/lib/libappimage/anda.hcl b/anda/lib/libappimage/anda.hcl index ad07678564..a7c08ba297 100644 --- a/anda/lib/libappimage/anda.hcl +++ b/anda/lib/libappimage/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "libappimage.spec" - update = "" } } diff --git a/anda/lib/marble-gtk/anda.hcl b/anda/lib/marble-gtk/anda.hcl deleted file mode 100644 index 3e83f17a8e..0000000000 --- a/anda/lib/marble-gtk/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "marble-gtk.spec" - update = "" - } -} diff --git a/anda/lib/marble-gtk/marble-gtk.spec b/anda/lib/marble-gtk/marble-gtk.spec deleted file mode 100644 index ce7a3430fe..0000000000 --- a/anda/lib/marble-gtk/marble-gtk.spec +++ /dev/null @@ -1,46 +0,0 @@ -# This is the dumbest thing ever -# Why make a library with the same name as another library gosh -%global commit 6dcc6fefa35f0151b0549c01bd774750fe6bdef8 -Name: marble-gtk -Version: 42.alpha0 -# No idea how they name the version -Release: %autorelease -Summary: My GTK library -License: GPLv3 -URL: https://gitlab.gnome.org/raggesilver/marble -BuildRequires: vala meson >= 0.50.0 pkgconfig(gtk4) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 -BuildRequires: pkgconfig(gio-2.0) >= 2.50 - -Source0: %{url}/-/archive/%{commit}/marble-%{commit}.tar.gz - -%description -%summary. -Just as Elementary has Granite I have Marble, my collection of useful functions -and reusable widgets. -# duh... - -%prep -%autosetup -n marble-%{commit} - -%build -%meson -%meson_build - -%install -%meson_install - -%files -%doc README.md -%license COPYING -/usr/include/marble.h -/usr/lib/debug/usr/lib64/libmarble.so* -/usr/lib64/girepository-1.0/Marble-*.typelib -/usr/lib64/libmarble.so* -/usr/lib64/pkgconfig/marble.pc -/usr/share/gir-1.0/Marble-*.gir -/usr/share/vala/vapi/marble.* - -%changelog -* Sat Oct 29 2022 windowsboy111 -- Initial package diff --git a/anda/others/blackbox-terminal/update.rhai b/anda/others/blackbox-terminal/update.rhai index 9f4ec280e8..1a35a5967e 100644 --- a/anda/others/blackbox-terminal/update.rhai +++ b/anda/others/blackbox-terminal/update.rhai @@ -1,3 +1,4 @@ let txt = get("https://gitlab.gnome.org/api/v4/projects/20397/releases/"); -let ver = json(txt).get_json(0).get_json("tag_name").string_json()[1:]; +let ver = str(json(txt) @ 0 @ "tag_name"); +ver.crop(1); rpm.version(ver); diff --git a/anda/others/tectonic/update.rhai b/anda/others/tectonic/update.rhai index 6ffa6dd9c7..531ce646d9 100644 --- a/anda/others/tectonic/update.rhai +++ b/anda/others/tectonic/update.rhai @@ -1 +1,3 @@ -rpm.version(gh("tectonic-typesetting/tectonic")); +let v = gh("tectonic-typesetting/tectonic"); +v.crop(9); +rpm.version(v); diff --git a/anda/srpm-macros/anda.hcl b/anda/srpm-macros/anda.hcl index a0c10642fa..3d144095f7 100644 --- a/anda/srpm-macros/anda.hcl +++ b/anda/srpm-macros/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "anda-srpm-macros.spec" - update = "" } } diff --git a/anda/tools/electron/anda.hcl b/anda/tools/electron/anda.hcl index d04d1f76bd..6e6f77533c 100644 --- a/anda/tools/electron/anda.hcl +++ b/anda/tools/electron/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "electron.spec" - update = "" } } diff --git a/anda/tools/lorax/anda.hcl b/anda/tools/lorax/anda.hcl index 33814007f8..0fa6bbd1c2 100644 --- a/anda/tools/lorax/anda.hcl +++ b/anda/tools/lorax/anda.hcl @@ -1,7 +1,6 @@ project "pkg" { rpm { spec = "lorax.spec" - update = "" enable_scm = true scm_opts = { diff --git a/anda/tools/melody/anda.hcl b/anda/tools/melody/anda.hcl index c78c208201..2c42a0a581 100644 --- a/anda/tools/melody/anda.hcl +++ b/anda/tools/melody/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "melody.spec" - update = "" } } diff --git a/anda/tools/muon/anda.hcl b/anda/tools/muon/anda.hcl index f02f50dafe..b9987d048a 100644 --- a/anda/tools/muon/anda.hcl +++ b/anda/tools/muon/anda.hcl @@ -1,6 +1,5 @@ project "pkg" { rpm { spec = "muon.spec" - update = "" } }