From e752f3e3f1e030d158fb06d1ab43352724d99279 Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Tue, 2 Jul 2024 18:43:41 +0530 Subject: [PATCH] fix/modules: update tar type to new syntax Signed-off-by: K.B.Dharun Krishna --- modules/00-vanilla-system-operator.yml | 8 ++++---- modules/03-fswarn.yml | 2 +- modules/21-gnome-control-center.yml | 4 ++-- recipe.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml index 0846d70..a1c7053 100644 --- a/modules/00-vanilla-system-operator.yml +++ b/modules/00-vanilla-system-operator.yml @@ -6,7 +6,7 @@ source: url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/continuous/vso.tar.gz commands: - mkdir -p /usr/bin -- cp /sources/vso /usr/bin/vso +- cp /sources/vso/vso /usr/bin/vso - chmod +x /usr/bin/vso modules: - name: vso-manpage @@ -15,7 +15,7 @@ modules: type: tar url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/continuous/vso-man.tar.gz commands: - - mv /sources/man/vso.1 /usr/share/man/man1/ + - mv /sources/vso-manpage/man/vso.1 /usr/share/man/man1/ - name: vso-os-shell type: shell commands: @@ -26,9 +26,9 @@ modules: type: shell source: type: tar - url: https://github.com/Vanilla-OS/vso-gnome-ext/archive/refs/tags/1.tar.gz + url: https://github.com/Vanilla-OS/vso-gnome-ext/archive/refs/tags/1.1.tar.gz commands: - - mv /sources/vso-gnome-ext-1/vso@vanillaos.org /usr/share/gnome-shell/extensions/ + - mv /sources/vso-gnome-ext/vso-gnome-ext-1.1/vso@vanillaos.org /usr/share/gnome-shell/extensions/ - name: vso-deps-install type: apt source: diff --git a/modules/03-fswarn.yml b/modules/03-fswarn.yml index 35b9727..1ce4008 100644 --- a/modules/03-fswarn.yml +++ b/modules/03-fswarn.yml @@ -2,7 +2,7 @@ name: fswarn type: shell commands: - mkdir -p /boot/ - - cp /sources/fswarn-x86_64.squash /boot/fswarn.squash + - cp /sources/fswarn/fswarn-x86_64.squash /boot/fswarn.squash source: type: tar url: https://github.com/Vanilla-OS/fswarn/releases/download/v1.0-1/fswarn.tar.xz diff --git a/modules/21-gnome-control-center.yml b/modules/21-gnome-control-center.yml index 7d0bb64..6e5247c 100644 --- a/modules/21-gnome-control-center.yml +++ b/modules/21-gnome-control-center.yml @@ -5,7 +5,7 @@ source: url: https://github.com/Vanilla-OS/gnome-control-center/releases/download/continuous/gnome-control-center.tar.xz checksum: cb4b55d7b3059fa861ce8d08048d6371923a5a8d7629a9ad51b8a09f58f44920 commands: - - dpkg -i /sources/gnome-control-center-data_46~99-orchid-beta_all.deb - - dpkg -i /sources/gnome-control-center_46~99-orchid-beta_amd64.deb + - dpkg -i /sources/gnome-control-center/gnome-control-center-data_46~99-orchid-beta_all.deb + - dpkg -i /sources/gnome-control-center/gnome-control-center_46~99-orchid-beta_amd64.deb - apt -y install -f - apt-mark hold gnome-control-center diff --git a/recipe.yml b/recipe.yml index d93d86f..874228d 100644 --- a/recipe.yml +++ b/recipe.yml @@ -32,8 +32,8 @@ stages: url: https://github.com/Vanilla-OS/vanilla-tools/releases/download/continuous/vanilla-tools.tar.gz commands: - mkdir -p /usr/bin - - cp /sources/vanilla-tools/lpkg /usr/bin/lpkg - - cp /sources/vanilla-tools/cur-gpu /usr/bin/cur-gpu + - cp /sources/vanilla-tools/vanilla-tools/lpkg /usr/bin/lpkg + - cp /sources/vanilla-tools/vanilla-tools/cur-gpu /usr/bin/cur-gpu - chmod +x /usr/bin/lpkg - chmod +x /usr/bin/cur-gpu