Add missing gschema.override file, add groupinstall scripts to install devel-tools
This commit is contained in:
parent
345abed5d8
commit
aa7e174823
4 changed files with 60 additions and 3 deletions
|
|
@ -0,0 +1,2 @@
|
||||||
|
[org.gnome.settings-daemon.plugins.power]
|
||||||
|
power-button-action='interactive'
|
||||||
6
files/scripts/groupinstall.sh
Normal file
6
files/scripts/groupinstall.sh
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -oex pipefail
|
||||||
|
set +u
|
||||||
|
|
||||||
|
dnf groupinstall "C Development Tools and Libraries" "Development Tools"
|
||||||
45
files/scripts/prepare-groupinstall.sh
Normal file
45
files/scripts/prepare-groupinstall.sh
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -oex pipefail
|
||||||
|
set +u
|
||||||
|
|
||||||
|
# Find the dnf groupinstall lines and extract quoted strings
|
||||||
|
VALUE="$(grep '^dnf groupinstall' /tmp/files/scripts/groupinstall.sh | grep -o '"[^"]*"' | tr '\n' ' ')"
|
||||||
|
echo "Extracted VALUE: $VALUE"
|
||||||
|
|
||||||
|
if [ -z "$VALUE" ]; then
|
||||||
|
echo "No groups found in build.sh"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Initialize an empty array
|
||||||
|
declare -a GROUP_ARRAY
|
||||||
|
|
||||||
|
|
||||||
|
# Use read with a custom delimiter to split the input string
|
||||||
|
while IFS='"' read -ra parts; do
|
||||||
|
for part in "${parts[@]}"; do
|
||||||
|
# Trim leading and trailing spaces and check if the part is not empty
|
||||||
|
trimmed=$(echo "$part" | xargs)
|
||||||
|
if [[ -n "$trimmed" ]]; then
|
||||||
|
GROUP_ARRAY+=("$trimmed")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done <<< "$VALUE"
|
||||||
|
echo "Raw Array without double-quotes: ${GROUP_ARRAY[*]}"
|
||||||
|
|
||||||
|
IS_DNF5=$(dnf --version | { grep -sc dnf5 || test $? = 1; })
|
||||||
|
echo "IS_DNF5: $IS_DNF5 (dnf4 = 0, else dnf5)"
|
||||||
|
for GROUP_E in "${GROUP_ARRAY[@]}"; do
|
||||||
|
echo "Getting pkgs for group: $GROUP_E"
|
||||||
|
if [ "$IS_DNF5" -ne 0 ]; then
|
||||||
|
#dnf5
|
||||||
|
OUTPUT="$OUTPUT $(dnf group info "$GROUP_E" 2>&1 | grep -E "packages|^[[:space:]]*:" | cut -d: -f2 | tr -s ' ' | tr -d '\n' | sed 's/^ //; s/ $//')"
|
||||||
|
else
|
||||||
|
#dnf4
|
||||||
|
OUTPUT="$OUTPUT $(dnf group info "$GROUP_E" 2>&1 | grep -v : | tr -d '\n' | tr -s ' ' | cut -c2-)"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
sed -i "s/^dnf groupinstall.*/rpm-ostree install $OUTPUT}/" /tmp/files/scripts/groupinstall.sh
|
||||||
|
|
@ -5,6 +5,13 @@ base-image: ghcr.io/ublue-os/bazzite-gnome
|
||||||
image-version: latest
|
image-version: latest
|
||||||
|
|
||||||
modules:
|
modules:
|
||||||
|
- type: script
|
||||||
|
scripts:
|
||||||
|
- prepare_groupinstall.sh
|
||||||
|
- type: script
|
||||||
|
scripts:
|
||||||
|
- groupinstall.sh
|
||||||
|
- download_install_rpms.sh
|
||||||
- type: files
|
- type: files
|
||||||
files:
|
files:
|
||||||
- source: system
|
- source: system
|
||||||
|
|
@ -44,9 +51,6 @@ modules:
|
||||||
- containerd.io
|
- containerd.io
|
||||||
- docker-buildx-plugin
|
- docker-buildx-plugin
|
||||||
- docker-compose-plugin
|
- docker-compose-plugin
|
||||||
- type: script
|
|
||||||
scripts:
|
|
||||||
- download_install_rpms.sh
|
|
||||||
- type: fonts
|
- type: fonts
|
||||||
fonts:
|
fonts:
|
||||||
nerd-fonts:
|
nerd-fonts:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue