From ba3eb9c123255ee6a604b27a45e74f9bfafb7cf3 Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Sun, 28 Jul 2024 05:56:35 +0530 Subject: [PATCH] fix(major): revert meson/file sources to use dpkg Signed-off-by: K.B.Dharun Krishna --- modules/00-vanilla-backgrounds.yml | 13 +++---- modules/00-vanilla-desktop-base.yml | 13 +++---- modules/00-vanilla-first-setup.yml | 13 +++---- modules/00-vanilla-gnome-default-settings.yml | 13 +++---- modules/00-vanilla-prime-utility.yml | 4 +- modules/00-vanilla-sideload.yml | 4 +- modules/00-vanilla-system-operator.yml | 4 +- modules/00-vanilla-tour.yml | 4 +- modules/131-plymouth-theme-vanilla.yml | 39 +++++-------------- modules/170-gnome-software-vso-plugin.yml | 10 ++--- 10 files changed, 49 insertions(+), 68 deletions(-) diff --git a/modules/00-vanilla-backgrounds.yml b/modules/00-vanilla-backgrounds.yml index 0d8cc03..9b9b9e4 100644 --- a/modules/00-vanilla-backgrounds.yml +++ b/modules/00-vanilla-backgrounds.yml @@ -1,12 +1,11 @@ name: vanilla-backgrounds -type: shell +type: dpkg-buildpackage source: - type: file - url: https://github.com/Vanilla-OS/vanilla-backgrounds/releases/download/v1.0.4/vanilla-backgrounds.deb - checksum: 212675d521cbe69d8c6547cb134784584dd0491ccb1a05c86c8ddfec161b036f -commands: - - dpkg -i /sources/vanilla-backgrounds/vanilla-backgrounds.deb - - apt -y install -f + type: git + url: https://github.com/Vanilla-OS/vanilla-backgrounds.git + tag: v1.0.4 + paths: + - vanilla-backgrounds modules: - name: vanilla-backgrounds-deps-install type: apt diff --git a/modules/00-vanilla-desktop-base.yml b/modules/00-vanilla-desktop-base.yml index 4a04cba..454c970 100644 --- a/modules/00-vanilla-desktop-base.yml +++ b/modules/00-vanilla-desktop-base.yml @@ -1,12 +1,11 @@ name: desktop-base -type: shell +type: dpkg-buildpackage source: - type: file - url: https://github.com/Vanilla-OS/desktop-base/releases/download/v1.0.0/desktop-base.deb - checksum: ef12defc7514096b076054f5eaf9ca276bba4757f360a2a097e7f2f31ced6840 -commands: - - dpkg -i /sources/desktop-base/desktop-base.deb - - apt -y install -f + type: git + url: https://github.com/Vanilla-OS/desktop-base.git + tag: v1.0.0 + paths: + - desktop-base modules: - name: desktop-base-deps-install type: apt diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml index 72a66bd..bf3c7af 100644 --- a/modules/00-vanilla-first-setup.yml +++ b/modules/00-vanilla-first-setup.yml @@ -1,12 +1,11 @@ name: vanilla-first-setup -type: shell +type: dpkg-buildpackage source: - type: file - url: https://github.com/Vanilla-OS/first-setup/releases/download/v2.2.0/vanilla-first-setup_2.2.0_amd64.deb - checksum: 2320ebffa72cfce093555c48dfe3cf3e670392262bb03bc7a514a169499ee770 -commands: - - dpkg -i /sources/vanilla-first-setup/vanilla-first-setup.deb - - apt -y install -f + type: git + url: https://github.com/Vanilla-OS/first-setup.git + tag: v2.2.0 + paths: + - vanilla-first-setup modules: - name: vanilla-first-setup-deps-install type: apt diff --git a/modules/00-vanilla-gnome-default-settings.yml b/modules/00-vanilla-gnome-default-settings.yml index 0371081..f0f39e8 100644 --- a/modules/00-vanilla-gnome-default-settings.yml +++ b/modules/00-vanilla-gnome-default-settings.yml @@ -1,12 +1,11 @@ name: vanilla-gnome-default-settings -type: shell +type: dpkg-buildpackage source: - type: file - url: https://github.com/Vanilla-OS/vanilla-gnome-default-settings/releases/download/v0.1/vanilla-gnome-default-settings.deb - checksum: 96d43a5c33673c315e67b317fbd62bba41cb8fd245c45b7036a88d8597f42b93 -commands: - - dpkg -i /sources/vanilla-gnome-default-settings/vanilla-gnome-default-settings.deb - - apt -y install -f + type: git + url: https://github.com/Vanilla-OS/vanilla-gnome-default-settings.git + tag: v0.1 + paths: + - vanilla-gnome-default-settings modules: - name: vanilla-gnome-default-settings-deps-install type: apt diff --git a/modules/00-vanilla-prime-utility.yml b/modules/00-vanilla-prime-utility.yml index 3404b7a..ba79623 100644 --- a/modules/00-vanilla-prime-utility.yml +++ b/modules/00-vanilla-prime-utility.yml @@ -1,10 +1,12 @@ name: vanilla-prime-utility -type: meson +type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/vanilla-prime-utility tag: v1.0.3 + paths: + - vanilla-prime-utility modules: - name: vanilla-prime-utility-deps-install type: apt diff --git a/modules/00-vanilla-sideload.yml b/modules/00-vanilla-sideload.yml index a40f440..6d663fe 100644 --- a/modules/00-vanilla-sideload.yml +++ b/modules/00-vanilla-sideload.yml @@ -1,9 +1,11 @@ name: vanilla-sideload -type: meson +type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/sideload-utility tag: v1.0.0 + paths: + - vanilla-sideload modules: - name: sideload-utility-deps-install type: apt diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml index 8eb7ca0..cf47ed3 100644 --- a/modules/00-vanilla-system-operator.yml +++ b/modules/00-vanilla-system-operator.yml @@ -52,11 +52,13 @@ modules: - ifstat - name: adwdialog - type: meson + type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/AdwDialog.git tag: v0.2.0 + paths: + - adwdialog modules: - name: adwdialog-deps-install type: apt diff --git a/modules/00-vanilla-tour.yml b/modules/00-vanilla-tour.yml index f18f09a..ed15c03 100644 --- a/modules/00-vanilla-tour.yml +++ b/modules/00-vanilla-tour.yml @@ -1,9 +1,11 @@ name: vanilla-tour -type: meson +type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/vanilla-tour tag: v0.0.1 + paths: + - vanilla-tour modules: - name: vanilla-tour-deps-install type: apt diff --git a/modules/131-plymouth-theme-vanilla.yml b/modules/131-plymouth-theme-vanilla.yml index 1a0bb9e..21fe358 100644 --- a/modules/131-plymouth-theme-vanilla.yml +++ b/modules/131-plymouth-theme-vanilla.yml @@ -1,30 +1,11 @@ -name: plymouth-theme-vanilla-bgrt -type: shell +name: plymouth-theme-vanilla +type: dpkg-buildpackage source: - type: file - url: https://github.com/Vanilla-OS/plymouth-theme-vanilla/releases/download/v1.0.0/plymouth-theme-vanilla-bgrt.deb - checksum: 63fdfe0e87c77ff6ce6253f2c975ab9dd3089849df76fa53a7ba8567e141886c -commands: - - dpkg -i /sources/plymouth-theme-vanilla-bgrt/plymouth-theme-vanilla-bgrt.deb - - apt -y install -f - -modules: - - name: plymouth-theme-vanilla-logo - type: shell - source: - type: file - url: https://github.com/Vanilla-OS/plymouth-theme-vanilla/releases/download/v1.0.0/plymouth-theme-vanilla-logo.deb - checksum: 031d418d89011c515b40fdbfba312c314f1d782537164cbe1a1787d0011695dc - commands: - - dpkg -i /sources/plymouth-theme-vanilla-logo/plymouth-theme-vanilla-logo.deb - - apt -y install -f - - - name: plymouth-theme-vanilla-text - type: shell - source: - type: file - url: https://github.com/Vanilla-OS/plymouth-theme-vanilla/releases/download/v1.0.0/plymouth-theme-vanilla-text.deb - checksum: fbeaca1b0d4f490ab0b0801552333eaa41683e0806084f2ab2cdea019125eb60 - commands: - - dpkg -i /sources/plymouth-theme-vanilla-text/plymouth-theme-vanilla-text.deb - - apt -y install -f + type: git + url: https://github.com/Vanilla-OS/plymouth-theme-vanilla + tag: v1.0.0 + paths: + - plymouth-theme-vanilla + - plymouth-theme-vanilla-bgrt + - plymouth-theme-vanilla-logo + - plymouth-theme-vanilla-text diff --git a/modules/170-gnome-software-vso-plugin.yml b/modules/170-gnome-software-vso-plugin.yml index c581bf3..1764dbb 100644 --- a/modules/170-gnome-software-vso-plugin.yml +++ b/modules/170-gnome-software-vso-plugin.yml @@ -1,9 +1,5 @@ -name: libgs_plugin_vso +name: gs-vso-plugin type: shell -source: - type: file - url: https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/v1.0.0/libgs_plugin_vso.so - checksum: ac9c6a95a2665b084ab3a0d962c35a1f2933bcf43859b1cd46cca2a8104698e4 commands: - - mkdir -p /usr/lib - - cp /sources/libgs_plugin_vso/libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/ +- curl -L -O https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/v1.0.0/libgs_plugin_vso.so +- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/