diff --git a/main.sh b/main.sh index 90fc3b5..a733163 100644 --- a/main.sh +++ b/main.sh @@ -156,7 +156,7 @@ hostname() { } base() { - . etc/base + . ./etc/base packages reset packages } @@ -164,7 +164,7 @@ base() { gfx() { input "Which GFX System?" "amd nvidia intel" "unknown error" GFX=$output - . etc/gfx/$GFX + . ./etc/gfx/$GFX packages reset packages } @@ -172,7 +172,7 @@ gfx() { soundsystem() { input "Which Soundsystem" "pulseaudio pipewire" "unknown error" SOUNDSYSTEM=$output - . etc/soundsystem/$SOUNDSYSTEM + . ./etc/soundsystem/$SOUNDSYSTEM packages reset packages } @@ -183,7 +183,7 @@ de() { if ! [ "$DE" == "minimal" ]; then gfx soundsystem - . etc/gfx/$DE + . ./etc/gfx/$DE packages reset packages fi @@ -221,11 +221,11 @@ do_install() { do_chroot() { mkdir -p ${target}/tmp/vinstaller/run - cp ${main}/etc/base ${target}/tmp/vinstaller/run + cp ./etc/base ${target}/tmp/vinstaller/run if ! [ "$DE" == "minimal" ]; then - cp ${main}/etc/gfx/$GFX ${target}/tmp/vinstaller/run - cp ${main}/etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run - cp ${main}/etc/gfx/$DE ${target}/tmp/vinstaller/run + cp ./etc/gfx/$GFX ${target}/tmp/vinstaller/run + cp ./etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run + cp ./etc/gfx/$DE ${target}/tmp/vinstaller/run fi echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars @@ -238,7 +238,7 @@ do_chroot() { cat < ${target}/tmp/vinstaller/main_chroot . /tmp/vinstaller/vars -for file in $(find /tmp/vinstaller/run -type f); do +for file in \$(find /tmp/vinstaller/run -type f); do . $file config done