mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-29 22:20:21 +00:00
chore: Remove signing from just and yafti
This is automatic now
This commit is contained in:
parent
a30a8f924a
commit
391a2afa1c
@ -10,21 +10,6 @@ screens:
|
||||
icon: "/usr/share/ublue-os/bazzite/logo.svg"
|
||||
description: |
|
||||
Configure your system to get started. Completion of this process is required for Game mode to function.
|
||||
sign-image:
|
||||
source: yafti.screen.package
|
||||
values:
|
||||
title: Signing Bazzite
|
||||
condition:
|
||||
run: grep -qvz "signed" <<< $(rpm-ostree status)
|
||||
show_terminal: true
|
||||
package_manager: yafti.plugin.run
|
||||
groups:
|
||||
Sign Bazzite:
|
||||
description: |
|
||||
This will sign your current install of Bazzite. Mandatory for offline installs. This will take awhile.
|
||||
default: true
|
||||
packages:
|
||||
- Sign Bazzite: just --unstable sign-image
|
||||
configure-bazzite:
|
||||
source: yafti.screen.package
|
||||
values:
|
||||
|
@ -476,36 +476,3 @@ use-broadcom-wl:
|
||||
# Enable Flatpak Theming
|
||||
enable-flatpak-theming:
|
||||
flatpak override --user --filesystem=xdg-config/gtk-4.0:ro --filesystem=xdg-config/gtk-3.0:ro --filesystem=~/.icons:ro --filesystem=~/.themes:ro
|
||||
|
||||
# Sign the current OCI OSTree Image (If unsigned)
|
||||
sign-image:
|
||||
source /etc/default/bazzite && \
|
||||
ublue-update --wait && \
|
||||
if grep -qvz "/var/${IMAGE_VENDOR}/image" <<< $(rpm-ostree status); then \
|
||||
rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image); \
|
||||
else \
|
||||
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}; \
|
||||
fi
|
||||
|
||||
_get-image:
|
||||
#!/usr/bin/env python
|
||||
from json import loads
|
||||
from subprocess import PIPE, run
|
||||
|
||||
"""Pull deployment status via rpm-ostree"""
|
||||
status = "rpm-ostree status --json"
|
||||
out = run(status, shell=True, stdout=PIPE).stdout
|
||||
|
||||
"""Parse current image"""
|
||||
deployments = loads(out)["deployments"][0]
|
||||
current_image = deployments["container-image-reference"].split(":", 1)
|
||||
|
||||
"""Dissect current image to form URL to latest image"""
|
||||
protocol = "docker://"
|
||||
url = current_image[1]
|
||||
|
||||
"""Add protocol if URL doesn't contain it"""
|
||||
if protocol not in url:
|
||||
url = protocol + url
|
||||
|
||||
print(url)
|
||||
|
@ -10,21 +10,6 @@ screens:
|
||||
icon: "/usr/share/ublue-os/bazzite/logo.svg"
|
||||
description: |
|
||||
Configure your system to get started
|
||||
sign-image:
|
||||
source: yafti.screen.package
|
||||
values:
|
||||
title: Signing Bazzite
|
||||
condition:
|
||||
run: grep -qvz "signed" <<< $(rpm-ostree status)
|
||||
show_terminal: true
|
||||
package_manager: yafti.plugin.run
|
||||
groups:
|
||||
Sign Bazzite:
|
||||
description: |
|
||||
This will sign your current install of Bazzite. Mandatory for offline installs. This will take awhile.
|
||||
default: true
|
||||
packages:
|
||||
- Sign Bazzite: just --unstable sign-image
|
||||
configure-bazzite-arch:
|
||||
source: yafti.screen.package
|
||||
values:
|
||||
|
@ -314,36 +314,3 @@ use-broadcom-wl:
|
||||
# Enable Flatpak Theming
|
||||
enable-flatpak-theming:
|
||||
flatpak override --user --filesystem=xdg-config/gtk-4.0:ro --filesystem=xdg-config/gtk-3.0:ro --filesystem=~/.icons:ro --filesystem=~/.themes:ro
|
||||
|
||||
# Sign the current OCI OSTree Image (If unsigned)
|
||||
sign-image:
|
||||
source /etc/default/bazzite && \
|
||||
ublue-update --wait && \
|
||||
if grep -qvz "/var/${IMAGE_VENDOR}/image" <<< $(rpm-ostree status); then \
|
||||
rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image); \
|
||||
else \
|
||||
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}; \
|
||||
fi
|
||||
|
||||
_get-image:
|
||||
#!/usr/bin/env python
|
||||
from json import loads
|
||||
from subprocess import PIPE, run
|
||||
|
||||
"""Pull deployment status via rpm-ostree"""
|
||||
status = "rpm-ostree status --json"
|
||||
out = run(status, shell=True, stdout=PIPE).stdout
|
||||
|
||||
"""Parse current image"""
|
||||
deployments = loads(out)["deployments"][0]
|
||||
current_image = deployments["container-image-reference"].split(":", 1)
|
||||
|
||||
"""Dissect current image to form URL to latest image"""
|
||||
protocol = "docker://"
|
||||
url = current_image[1]
|
||||
|
||||
"""Add protocol if URL doesn't contain it"""
|
||||
if protocol not in url:
|
||||
url = protocol + url
|
||||
|
||||
print(url)
|
||||
|
Loading…
x
Reference in New Issue
Block a user