From 040ab262f71a586088a227583b22ca1c259ab907 Mon Sep 17 00:00:00 2001
From: Faeiz Mahrus <faeizmahrus@outlook.com>
Date: Wed, 25 Dec 2024 23:26:14 +0600
Subject: [PATCH] fix: Cleanup fedora-example and packages/

---
 ContainerFiles/fedora-example    | 17 +++++++----------
 packages/boxkit-packages         | 30 ------------------------------
 packages/fedora-example-packages |  1 -
 packages/fedora-sample-packages  |  1 -
 4 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 packages/boxkit-packages
 delete mode 100644 packages/fedora-example-packages
 delete mode 100644 packages/fedora-sample-packages

diff --git a/ContainerFiles/fedora-example b/ContainerFiles/fedora-example
index c4466b3..5e5304a 100644
--- a/ContainerFiles/fedora-example
+++ b/ContainerFiles/fedora-example
@@ -5,14 +5,11 @@ LABEL com.github.containers.toolbox="true" \
       summary="An example ContainerFile to demonstrate multiple image builds." \
       maintainer="faeizmahrus@outlook.com"
 
-COPY ../packages/fedora-sample-packages /
-RUN dnf update -y && \
-    grep -v '^#' /fedora-sample-packages | xargs dnf install -y
-RUN rm /fedora-sample-packages
+# Copy the setup scripts and package list
+COPY ../scripts/fedora-sample.sh /
+COPY ../scripts/distrobox-shims.sh /
+COPY ../packages/fedora-example.packages /
 
-RUN   ln -fs /bin/sh /usr/bin/sh && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \ 
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
+# Run the setup scripts
+RUN chmod +x fedora-example.sh distrobox-shims.sh && /fedora-example.sh
+RUN rm /fedora-example.sh /distrobox-shims.sh /fedora-example.packages
diff --git a/packages/boxkit-packages b/packages/boxkit-packages
deleted file mode 100644
index 88dbf66..0000000
--- a/packages/boxkit-packages
+++ /dev/null
@@ -1,30 +0,0 @@
-age
-atuin
-btop
-bat
-chezmoi
-clipboard
-cosign
-dbus-x11
-direnv
-eza
-ffmpeg
-fzf
-github-cli
-helix
-just
-make
-micro
-ncdu
-ncurses
-neovim
-npm
-plocate
-python3
-ripgrep
-speedtest-cli
-starship
-vimdiff
-wl-clipboard
-zellij
-zstd
diff --git a/packages/fedora-example-packages b/packages/fedora-example-packages
deleted file mode 100644
index 00af54c..0000000
--- a/packages/fedora-example-packages
+++ /dev/null
@@ -1 +0,0 @@
-helix
\ No newline at end of file
diff --git a/packages/fedora-sample-packages b/packages/fedora-sample-packages
deleted file mode 100644
index 00af54c..0000000
--- a/packages/fedora-sample-packages
+++ /dev/null
@@ -1 +0,0 @@
-helix
\ No newline at end of file