From e08e9cf9a211f9980eaad7cba57217ef8f149224 Mon Sep 17 00:00:00 2001 From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com> Date: Thu, 17 Jul 2025 13:33:01 -0400 Subject: [PATCH] Use official os-release --- modules/os-release/os-release.nu | 34 -------------------------------- recipes/cp-laptop.yml | 1 - recipes/jp-desktop-nvidia.yml | 2 -- recipes/jp-laptop.yml | 1 - 4 files changed, 38 deletions(-) delete mode 100644 modules/os-release/os-release.nu diff --git a/modules/os-release/os-release.nu b/modules/os-release/os-release.nu deleted file mode 100644 index 4cd0ce9..0000000 --- a/modules/os-release/os-release.nu +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env nu - -def main [config: string]: nothing -> nothing { - let config = $config - | from json - | default {} properties - mut os_release = open --raw /etc/os-release - | lines - | parse '{key}={value}' - | transpose --ignore-titles -dr - | str trim -c '"' - | str trim -c "'" - print $'(ansi green)Original release:(ansi reset)' - print $os_release - - for $item in ($config.properties | transpose key value) { - if $item.key in $os_release { - print $'(ansi green)Updating (ansi cyan)($item.key)(ansi green) with value (ansi yellow)($item.value)(ansi reset)' - $os_release = $os_release | update $item.key $item.value - } else { - print $'(ansi green)Adding (ansi cyan)($item.key)(ansi green) with value (ansi yellow)($item.value)(ansi reset)' - $os_release = $os_release | insert $item.key $item.value - } - } - - print $'(ansi green)New release:(ansi reset)' - print $os_release - - $os_release - | transpose key value - | each { $'($in.key)="($in.value)"' } - | str join "\n" - | save --force /etc/os-release -} diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml index 476aecf..0932eb1 100644 --- a/recipes/cp-laptop.yml +++ b/recipes/cp-laptop.yml @@ -6,7 +6,6 @@ image-version: 42 description: The image of Wunker OS for CP's laptop. modules: - type: os-release - source: local properties: NAME: WunkerOS ID: wunker_os diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml index 50e3678..254cf40 100644 --- a/recipes/jp-desktop-nvidia.yml +++ b/recipes/jp-desktop-nvidia.yml @@ -21,8 +21,6 @@ nushell-version: none # ref: 605bb63a4de640b77f6d3017238ece48cb286933 # supposed fix modules: - type: os-release - # source: local - source: ghcr.io/blue-build/modules/os-release:os-release properties: NAME: WunkerOS ID: wunker_os diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml index 071e6f0..3885496 100644 --- a/recipes/jp-laptop.yml +++ b/recipes/jp-laptop.yml @@ -9,7 +9,6 @@ description: The image of Wunker OS for JP's Laptop. # - from-file: common/helix.yml modules: - type: os-release - source: local properties: NAME: WunkerOS ID: wunker_os