From 3ba17d4a311c88eea15f76de766a6d73d1aea322 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 7 Feb 2022 16:07:10 +0100
Subject: [PATCH] progress

---
 main.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/main.sh b/main.sh
index fac130f..de14334 100644
--- a/main.sh
+++ b/main.sh
@@ -164,7 +164,6 @@ base() {
 	. ./etc/base
 	packages
 	reset packages
-	cp ./etc/base $tmp_target
 }
 
 gfx() {
@@ -326,15 +325,10 @@ do_install() {
 
 do_chroot() {
 	mkdir -p ${target}/tmp/vinstaller/run
+	cp ./etc/functions ${target}/tmp/vinstaller/
+	cp ./etc/base ${target}/tmp/vinstaller/
 	
-	cp ./etc/base ${target}/tmp/vinstaller/run
-	cp ./etc/functions ${target}/tmp/vinstaller/run
-	if ! [ "$DE" == "minimal" ]; then
-		cp ./etc/gfx/$GFX ${target}/tmp/vinstaller/run
-		cp ./etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run
-		cp ./etc/de/$DE ${target}/tmp/vinstaller/run
-		cp ./etc/x11 ${target}/tmp/vinstaller/run
-	fi
+	cp -rf $tmp_target ${target}/tmp/vinstaller/run
 	
 	echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars
 	echo "pass=$pass" > ${target}/tmp/vinstaller/vars
@@ -348,8 +342,10 @@ do_chroot() {
 
 cat <<EOF > ${target}/tmp/vinstaller/main_chroot
 #!/bin/bash
-. /tmp/vinstaller/vars
 . /tmp/vinstaller/functions
+. /tmp/vinstaller/vars
+. /tmp/vinstaller/base
+
 for file in \$(find /tmp/vinstaller/run -type f); do
 	. \$file
 	config