diff --git a/chrootInstall.sh b/chrootInstall.sh index af5fc20..1ba43c3 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -1,18 +1,18 @@ #!/usr/bin/env bash # Importing Variables -formfactor="$(cat /tempfiles/formfactor)" -device="$(cat /tempfiles/device)" -cpu="$(cat /tempfiles/cpu)" -threadsminusone="$(cat /tempfiles/threadsminusone)" -gpu="$(cat /tempfiles/gpu)" -intel_vaapi_driver="$(cat /tempfiles/intel_vaapi_driver)" -boot="$(cat /tempfiles/boot)" -disk="$(cat /tempfiles/disk)" -username="$(cat /tempfiles/username)" -userpassword="$(cat /tempfiles/userpassword)" -rootpassword="$(cat /tempfiles/rootpassword)" -timezone="$(cat /tempfiles/timezone)" +formfactor="$(< /tempfiles/formfactor)" +device="$(< /tempfiles/device)" +cpu="$(< /tempfiles/cpu)" +threadsminusone="$(< /tempfiles/threadsminusone)" +gpu="$(< /tempfiles/gpu)" +intel_vaapi_driver="$(< /tempfiles/intel_vaapi_driver)" +boot="$(< /tempfiles/boot)" +disk="$(< /tempfiles/disk)" +username="$(< /tempfiles/username)" +userpassword="$(< /tempfiles/userpassword)" +rootpassword="$(< /tempfiles/rootpassword)" +timezone="$(< /tempfiles/timezone)" # configuring locale and clock Settings echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen diff --git a/install.sh b/install.sh index f2ba06e..cba08a4 100755 --- a/install.sh +++ b/install.sh @@ -38,7 +38,7 @@ read -r -p "timezone: " timezone cpu=$(lscpu | grep 'Vendor ID:' | awk 'FNR == 1 {print $3;}') threadsminusone=$(echo "$(lscpu | grep 'CPU(s):' | awk 'FNR == 1 {print $2;}') - 1" | bc) gpu=$(lspci | grep 'VGA compatible controller:' | awk 'FNR == 1 {print $5;}') -ram=$(echo "$(cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2;}') / 1000000" | bc) +ram=$(echo "$(< /proc/meminfo)" | grep 'MemTotal:' | awk '{print $2;}'); ram=$(echo "$ram / 1000000" | bc) # stop hardware detection # start conditional questions