From 59475126f615b23ca03bd396e8d13a4335286d81 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Sat, 12 Oct 2024 18:45:51 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rootfs/root/docker/setup/01-system.sh
rootfs/root/docker/setup/03-files.sh
rootfs/root/docker/setup/06-post.sh
---
 rootfs/root/docker/setup/01-system.sh | 12 ++----------
 rootfs/root/docker/setup/03-files.sh  |  9 +++++++--
 rootfs/root/docker/setup/06-post.sh   |  4 +++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh
index 553383a..856b48a 100755
--- a/rootfs/root/docker/setup/01-system.sh
+++ b/rootfs/root/docker/setup/01-system.sh
@@ -24,18 +24,10 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-update_conf_files="$(find '/etc' -iname '*.pacnew')"
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-if [ -n "$update_conf_files" ]; then
-  for conf in $update_conf_files; do
-    name="${conf//.pacnew/}"
-    mv -f "$conf" "$name"
-  done
-fi
-if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
-  sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
-fi
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh
index 94adf9c..b7667f5 100755
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -24,10 +24,15 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-
+update_conf_files="$(find '/etc' -iname '*.pacnew')"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-
+if [ -n "$update_conf_files" ]; then
+  for conf in $update_conf_files; do
+    name="${conf//.pacnew/}"
+    mv -f "$conf" "$name"
+  done
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh
index ea65009..d701e91 100755
--- a/rootfs/root/docker/setup/06-post.sh
+++ b/rootfs/root/docker/setup/06-post.sh
@@ -27,7 +27,9 @@ exitCode=0
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-
+if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
+  sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?