From e7873de2d6ab5d86129d7c90b0bbaf113dbf9b5d Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Thu, 1 Aug 2024 16:56:33 +0300
Subject: [PATCH] Fix chroot_scripts_path

---
 .github/push-iso                        |  2 +-
 chroot_scripts/0-chroot.sh              | 10 +++++-----
 chroot_scripts/2-install-live-lists.sh  |  8 ++++----
 chroot_scripts/3-download-pool.sh       |  8 ++++----
 chroot_scripts/4-uninstall-rem-lists.sh |  8 ++++----
 chroot_scripts/5-run-hooks.sh           |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/push-iso b/.github/push-iso
index b6a7d89..98d9bcb 100644
--- a/.github/push-iso
+++ b/.github/push-iso
@@ -1 +1 @@
-16
+17
diff --git a/chroot_scripts/0-chroot.sh b/chroot_scripts/0-chroot.sh
index 7470d0b..56bfe2b 100755
--- a/chroot_scripts/0-chroot.sh
+++ b/chroot_scripts/0-chroot.sh
@@ -44,8 +44,8 @@ apt-get install --yes --option Dpkg::Options::="--force-confnew" --no-install-re
     nano
     
 # Run chroot steps
-/etc/chroot_scripts/1-baseos.sh
-/etc/chroot_scripts/2-install-live-lists.sh
-/etc/chroot_scripts/3-download-pool.sh
-/etc/chroot_scripts/4-uninstall-rem-lists.sh
-/etc/chroot_scripts/5-run-hooks.sh
+/chroot_scripts/1-baseos.sh
+/chroot_scripts/2-install-live-lists.sh
+/chroot_scripts/3-download-pool.sh
+/chroot_scripts/4-uninstall-rem-lists.sh
+/chroot_scripts/5-run-hooks.sh
diff --git a/chroot_scripts/2-install-live-lists.sh b/chroot_scripts/2-install-live-lists.sh
index f010ae0..4b4b573 100755
--- a/chroot_scripts/2-install-live-lists.sh
+++ b/chroot_scripts/2-install-live-lists.sh
@@ -4,16 +4,16 @@ set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-touch /etc/chroot_scripts/live_list
+touch /chroot_scripts/live_list
 
-for live_list in /etc/chroot_scripts/live-lists/*.list
+for live_list in /chroot_scripts/live-lists/*.list
 do
 	for pkg in $(cat $live_list)
 	do
-		echo $pkg >> /etc/chroot_scripts/live_list
+		echo $pkg >> /chroot_scripts/live_list
 	done
 done
 
-apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" $(cat /etc/chroot_scripts/live_list | tr "\n" " ")
+apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/live_list | tr "\n" " ")
 
 
diff --git a/chroot_scripts/3-download-pool.sh b/chroot_scripts/3-download-pool.sh
index b1af445..9c6a42f 100755
--- a/chroot_scripts/3-download-pool.sh
+++ b/chroot_scripts/3-download-pool.sh
@@ -4,17 +4,17 @@ set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-touch /etc/chroot_scripts/pool_list
+touch /chroot_scripts/pool_list
 
-for pool_list in /etc/chroot_scripts/pool-lists/*.list
+for pool_list in /chroot_scripts/pool-lists/*.list
 do
 	for pkg in $(cat $pool_list)
 	do
-		echo $pkg >> /etc/chroot_scripts/pool_list
+		echo $pkg >> /chroot_scripts/pool_list
 	done
 done
 
 mkdir -p /cdrom/pool/main/
 pushd /cdrom/pool/main/
-apt-get download --yes $(cat /etc/chroot_scripts/pool_list | tr "\n" " ")
+apt-get download --yes $(cat /chroot_scripts/pool_list | tr "\n" " ")
 popd
\ No newline at end of file
diff --git a/chroot_scripts/4-uninstall-rem-lists.sh b/chroot_scripts/4-uninstall-rem-lists.sh
index 58c7971..188869f 100755
--- a/chroot_scripts/4-uninstall-rem-lists.sh
+++ b/chroot_scripts/4-uninstall-rem-lists.sh
@@ -4,16 +4,16 @@ set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-touch /etc/chroot_scripts/rem_list
+touch /chroot_scripts/rem_list
 
-for rem_list in /etc/chroot_scripts/rem-lists/*.list
+for rem_list in /chroot_scripts/rem-lists/*.list
 do
 	for pkg in $(cat $rem_list)
 	do
-		echo $pkg >> /etc/chroot_scripts/rem_list
+		echo $pkg >> /chroot_scripts/rem_list
 	done
 done
 
-apt-get purge --yes --option Dpkg::Options::="--force-confnew" $(cat /etc/chroot_scripts/rem_list | tr "\n" " ") || true
+apt-get purge --yes --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/rem_list | tr "\n" " ") || true
 
 
diff --git a/chroot_scripts/5-run-hooks.sh b/chroot_scripts/5-run-hooks.sh
index 82c5421..e36d762 100755
--- a/chroot_scripts/5-run-hooks.sh
+++ b/chroot_scripts/5-run-hooks.sh
@@ -6,7 +6,7 @@ export DEBIAN_FRONTEND="noninteractive"
 
 export ORIGINAL_WORKINGDIR=$(pwd)
 
-for hook in /etc/chroot_scripts/hooks/*
+for hook in /chroot_scripts/hooks/*
 do
 	$hook
 	cd $ORIGINAL_WORKINGDIR