From b41eb6bd15603aca23952f89904b0d771ada5445 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 12 Jul 2023 11:51:28 +0200 Subject: [PATCH] container toolbox - make additional packages alphabetically ordered - disable manpage checks Signed-off-by: Tomas Hrcka --- fedora-container-toolbox.ks | 94 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/fedora-container-toolbox.ks b/fedora-container-toolbox.ks index 0f9905d..404f544 100644 --- a/fedora-container-toolbox.ks +++ b/fedora-container-toolbox.ks @@ -7,48 +7,35 @@ # Install packages %packages --inst-langs=en --nocore --exclude-weakdeps -rootfiles -tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -vim-enhanced -dnf5 -sudo --glibc-minimal-langpack -glibc-all-langpacks acl bash -coreutils-common -curl -findutils -gawk -gnupg2 -grep -gzip -libcap -openssl -p11-kit -pam -python3 -rpm -sed -systemd -util-linux-core bash-completion bc bzip2 +coreutils-common +curl diffutils +dnf5 dnf5-plugins +findutils flatpak-spawn fpaste +gawk git +-glibc-minimal-langpack +glibc-all-langpacks +gnupg2 gnupg2-smime +grep gvfs-client +gzip hostname iproute iputils -whois keyutils krb5-libs less +libcap lsof man-db man-pages @@ -58,21 +45,34 @@ mtr nano-default-editor nss-mdns openssh-clients +openssl +p11-kit +pam passwd pigz procps-ng +python3 +rootfiles +rpm rsync +sed shadow-utils +sudo +systemd +tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tcpdump time traceroute tree unzip util-linux +util-linux-core +vim-enhanced vte-profile vulkan-loader wget which +whois words xorg-x11-xauth xz @@ -116,30 +116,30 @@ rm -rfv /var/cache/* /var/log/* /tmp/* set -eux # Check if specified files exist -declare -a files=( - "/usr/share/man/man1/bash.1*" - "/usr/share/man/man1/cd.1*" - "/usr/share/man/man1/export.1*" - "/usr/share/man/man1/cat.1*" - "/usr/share/man/man1/cp.1*" - "/usr/share/man/man1/ls.1*" - "/usr/share/man/man1/gpg2.1*" - "/usr/share/man/man7/gnupg2.7*" - "/usr/share/man/fr/man8/rpm.8*" - "/usr/share/man/ja/man8/rpm.8*" - "/usr/share/man/man8/rpm.8*" - "/usr/share/man/man1/kill.1*" - "/usr/share/man/man8/mount.8*" -) +#declare -a files=( +# "/usr/share/man/man1/bash.1*" +# "/usr/share/man/man1/cd.1*" +# "/usr/share/man/man1/export.1*" +# "/usr/share/man/man1/cat.1*" +# "/usr/share/man/man1/cp.1*" +# "/usr/share/man/man1/ls.1*" +# "/usr/share/man/man1/gpg2.1*" +# "/usr/share/man/man7/gnupg2.7*" +# "/usr/share/man/fr/man8/rpm.8*" +# "/usr/share/man/ja/man8/rpm.8*" +# "/usr/share/man/man8/rpm.8*" +# "/usr/share/man/man1/kill.1*" +# "/usr/share/man/man8/mount.8*" +#) -ret_val=0 -for file in "${files[@]}"; do - if ! compgen -G "$file" >/dev/null; then - echo "$file: No such file or directory" >&2 - ret_val=1 - break - fi -done +#ret_val=0 +#for file in "${files[@]}"; do +# if ! compgen -G "$file" >/dev/null; then +# echo "$file: No such file or directory" >&2 +# ret_val=1 +# break +# fi +#done if [ "$ret_val" -ne 0 ]; then false