diff --git a/Einrichter-CLI.sh b/Einrichter-CLI.sh index 75932b9..a9878ad 100755 --- a/Einrichter-CLI.sh +++ b/Einrichter-CLI.sh @@ -1,13 +1,23 @@ #!/bin/bash if [ "$EUID" -ne 0 ] -then echo "Please run Einrichter (TylkoLinux) using administrative permissions." -exit + then echo "Please run Einrichter (TylkoLinux) using administrative permissions." + exit fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) EINRICHTER_VER=0.3.0 function booter() { + read -p "[?] The LFS variable has been set to $LFS, which means that it'll be the installation to be modified. If this is what you wanted, continue. If not, exit the installer immediately, as there may be a risk of messing up your main installation. Continue? [y/n]: " WOPT + case "$WOPT" in + y|Y|Yes|yes|YES) + printf "" + ;; + *) + echo "[i] If running through sudo or other authentication agent, make sure to append \"LFS=(path to install)\" before the command to set the correct path." + exit 1 + ;; + esac einrichter.colours echo "Einrichter - TylkoLinux Installer Shell $EINRICHTER_VER The script is located at $SCRIPT_DIR @@ -273,7 +283,7 @@ function einrichter.backup.create() { echo -e "${BRed}[?] Variable LFS points to ${LFS}. This needs to point to the target LFS system. If this does NOT point to the LFS directory, EXIT NOW AND SET THE VARIABLE. This will otherwise DESTROY THE ENTIRE HOST SYSTEM. YOU ARE WARNED.${Color_Off}" - read -p "[?] Continue? (y/n) " OPT + read -p "[?] Continue? [y/n]: " OPT if [ "$OPT" = "y" ]; then echo "Continuing..."; else exit 1; fi echo "[i] Unmounting the virtual file systems..." mountpoint -q $LFS/dev/shm && umount $LFS/dev/shm @@ -290,7 +300,7 @@ function einrichter.backup.restore() { echo -e "${BRed}[?] Variable LFS points to ${LFS}. This needs to point to the target LFS system. If this does NOT point to the LFS directory, EXIT NOW AND SET THE VARIABLE. This will otherwise DESTROY THE ENTIRE HOST SYSTEM. YOU ARE WARNED.${Color_Off}" - read -p "[?] Continue? (y/n) " OPT + read -p "[?] Continue? [y/n]: " OPT echo "[i] Restoring from backup..." cd $LFS rm -rf ./* @@ -302,201 +312,6 @@ function einrichter.installer.bg() { echo "E" } -function einrichter.xr() { - echo "[i] Extracting and renaming ALL packages..." - sleep 0.5 - pushd $LFS/sources/ || einrichter.error DIR404_SRC - tar -xvf gcc-14.2.0.tar.xz - mv -v gcc-14.2.0 gcc - pushd $LFS/sources/gcc - tar -xf ../mpfr-4.2.1.tar.xz - mv -v mpfr-4.2.1 mpfr - tar -xf ../gmp-6.3.0.tar.xz - mv -v gmp-6.3.0 gmp - tar -xf ../mpc-1.3.1.tar.gz - mv -v mpc-1.3.1 mpc - popd - tar -xvf $LFS/sources/binutils-2.43.1.tar.xz - mv binutils-2.43.1 binutils - tar -xvf linux-6.10.5.tar.xz - mv -v linux-6.10.5 linux - tar -xvf glibc-2.40.tar.xz - mv -v glibc-2.40 glibc - tar -xvf coreutils-9.5.tar.xz - mv coreutils-9.5 coreutils - tar -xvf diffutils-3.10.tar.xz - mv diffutils-3.10 diffutils - tar -xvf file-5.45.tar.gz - mv file-5.45 file - tar -xvf m4-1.4.19.tar.xz - mv m4-1.4.19 m4 - tar -xvf ncurses-6.5.tar.gz - mv ncurses-6.5 ncurses - tar -xvf bash-5.2.32.tar.gz - mv bash-5.2.32 bash - tar -xvf findutils-4.10.0.tar.xz - mv findutils-4.10.0 findutils - tar -xvf gawk-5.3.0.tar.*z - mv gawk-5.3.0 gawk - tar -xvf grep-3.11.tar.*z - mv grep-3.11 grep - tar -xvf gzip-1.13.tar.*z - mv gzip-1.13 gzip - tar -xvf make-4.4.1.tar.*z - mv make-4.4.1 make - tar -xvf patch-2.7.6.tar.*z - mv patch-2.7.6 patch - tar -xvf sed-4.9.tar.*z - mv sed-4.9 sed - tar -xvf tar-1.35* - mv tar-1.35 tar - tar -xvf xz-5.6.2.tar.*z - mv xz-5.6.2 xz - tar -xvf gettext*xz - mv gettext-0.22.5 gettext - tar -xvf bison*xz - mv bison-3.8.2 bison - tar -xvf perl*xz - mv perl-5.40.0 perl - tar -xvf Python*xz - mv Python-3.12.5 python - tar -xvf texinfo*xz - mv texinfo-7.1 texinfo - tar -xvf util-linux*.xz - mv util-linux-2.40.2 util-linux - tar -xvf man-pages-6.9.1.tar.xz - mv man-pages-6.9.1.tar.xz man-pages - tar -xvf iana-etc-20240806.tar.gz - tar -xvf zlib-1.3.1.tar.gz - mv zlib-1.3.1 zlib - tar -xvf bzip2-1.0.8.tar.gz - mv bzip2-1.0.8 bzip2 - tar -xvf lz4-1.10.0.tar.gz - mv lz4-1.10.0 lz4 - tar -xvf zstd-1.5.6.tar.gz - mv zstd-1.5.6 zstd - tar -xvf readline-8.2.13.tar.gz - mv readline-8.2.13 readline - tar -xvf bc-6.7.6.tar.xz - mv bc-6.7.6 bc - tar -xvf flex-2.6.4.tar.gz - mv flex-2.6.4 flex - tar -xvf tcl8.6.14-src.tar.gz - mv tcl8.6.14 tcl - tar -xvf expect5.45.4.tar.gz - mv expect5.45.4 expect - tar -xvf dejagnu-1.6.3.tar.gz - mv dejagnu-1.6.3 dejagnu - tar -xvf pkgconf-2.3.0.tar.xz - mv pkgconf-2.3.0 pkgconf - tar -xvf gmp-6.3.0.tar.xz - mv gmp-6.3.0 gmp - tar -xvf mpfr-4.2.1.tar.xz - mv mpfr-4.2.1 mpfr - tar -xvf mpc-1.3.1.tar.gz - mv mpc-1.3.1 mpc - tar -xvf attr-2.5.2.tar.gz - mv attr-2.5.2 attr - tar -xvf acl-2.3.2.tar.xz - mv acl-2.3.2 acl - tar -xvf libcap-2.70.tar.xz - mv libcap-2.70 libcap - tar -xvf libxcrypt-4.4.36.tar.xz - mv libxcrypt-4.4.36 libxcrypt - tar -xvf shadow-4.16.0.tar.xz - mv shadow-4.16.0 shadow - tar -xvf psmisc-23.7.tar.xz - mv psmisc-23.7 psmisc - tar -xvf libtool-2.4.7.tar.xz - mv libtool-2.4.7 libtool - tar -xvf gdbm-1.24.tar.gz - mv gdbm-1.24 gdbm - tar -xvf gperf-3.1.tar.gz; - mv gperf-3.1 gperf - tar -xvf expat-2.6.4.tar.xz; - mv expat-2.6.4 expat - tar -xvf inetutils-2.5.tar.xz - mv inetutils-2.5 inetutils - tar -xvf less-661.tar.gz; - mv less-661 less - tar -xvf XML-Parser-2.47.tar.gz; - mv XML-Parser-2.47 XML-Parser - tar -xvf intltool-0.51.0.tar.gz; - mv intltool-0.51.0 intltool - tar -xvf autoconf-2.72.tar.xz; - tar -xvf automake-1.17.tar.xz; - mv autoconf-2.72 autoconf; - mv automake-1.17 automake - tar -xvf openssl-3.3.1.tar.gz; - mv openssl-3.3.1 openssl - tar -xvf kmod-33.tar.xz; - mv kmod-33 kmod - tar -xvf elfutils-0.191.tar.bz2; - mv elfutils-0.191 elfutils - tar -xvf libffi-3.4.6.tar.gz; - mv libffi-3.4.6 libffi - tar -xvf flit_core-3.9.0.tar.gz; - mv flit_core-3.9.0 flit_core - tar -xvf wheel-0.44.0.tar.gz; - mv wheel-0.44.0 wheel - tar -xvf setuptools-72.2.0.tar.gz; - mv setuptools-72.2.0 setuptools - tar -xvf ninja-1.12.1.tar.gz; - mv ninja-1.12.1 ninja - tar -xvf meson-1.5.1.tar.gz; - mv meson-1.5.1 meson - tar -xvf check-0.15.2.tar.gz; - mv check-0.15.2 check - tar -xvf groff-1.23.0.tar.gz; - mv groff-1.23.0 groff - tar -xvf grub-2.12.tar.xz; - mv grub-2.12 grub - tar -xvf iproute2-6.10.0.tar.xz; - mv iproute2-6.10.0 iproute2 - tar -xvf kbd-2.6.4.tar.xz; - mv kbd-2.6.4 kbd - tar -xvf libpipeline-1.5.7.tar.gz; - mv libpipeline-1.5.7 libpipeline - tar -xvf nano-8.1.tar.xz; - mv nano-8.1 nano - tar -xvf MarkupSafe-2.1.5.tar.gz; - mv MarkupSafe-2.1.5 MarkupSafe - tar -xvf jinja2-3.1.4.tar.gz; - mv jinja2-3.1.4 jinja - tar -xvf systemd-256.4.tar.gz; - mv systemd-256.4 systemd - tar -xvf dbus-1.14.10.tar.xz; - mv dbus-1.14.10 dbus - tar -xvf man-db-2.12.1.tar.xz; - mv man-db-2.12.1 man-db - tar -xvf procps-ng-4.0.4.tar.xz; - mv procps-ng-4.0.4 procps-ng - tar -xvf e2fsprogs-1.47.1.tar.gz; - mv e2fsprogs-1.47.1 e2fsprogs - tar -xvf git-2.48.1.tar.xz - mv git-2.48.1 git - tar -xvf wget-1.24.5.tar.gz - mv wget-1.24.5 wget - tar -xvf p11-kit-0.25.5.tar.xz - mv p11-kit-0.25.5 p11-kit - tar -xvf make-ca-1.14.tar.gz - mv make-ca-1.14 make-ca - tar -xvf libtasn1-4.19.0.tar.gz - mv libtasn1-4.19.0 libtasn1 - tar -xvf cpio-2.15.tar.bz2 - mv cpio-2.15 cpio - tar -xvf hwdata-0.385.tar.gz - mv hwdata-0.385 hwdata - tar -xvf pciutils-3.13.0.tar.gz - mv pciutils-3.13.0 pciutils - tar -xvf libgpg-error-1.50.tar.bz2 - mv libgpg-error-1.50 libgpg-error - tar -xvf libassuan-3.0.1.tar.bz2 - mv libassuan-3.0.1 libassaun - tar -xvf gpgme-1.23.2.tar.bz2 - mv gpgme-1.23.2 gpgme -} - function einrichter.add.fs() { cp -vR $SCRIPT_DIR/add/fs/* $LFS/ } diff --git a/Einrichter-as-LFS.sh b/Einrichter-as-LFS.sh index 7f989a7..d0d07a3 100755 --- a/Einrichter-as-LFS.sh +++ b/Einrichter-as-LFS.sh @@ -1,7 +1,31 @@ #!/bin/bash main() { + read -p "Attempting to modify installation at $LFS. Is this correct? (y/n): " WOPT + case "$WOPT" in + y|Y) + echo "OK!" + ;; + *) + exit 1 + ;; + esac echo "Einrichter is designed to work as an install script where you can resume where you left off. Do NOT skip anything if you have not ran the step yet. Type R to run, S to skip and Q to quit." + read -p "Pending step: Extracting packages. Run, skip or quit?" OPT + case "$OPT" in + R) + eal.setup.xr + ;; + S) + echo "Step skipped." + ;; + Q) + exit + ;; + *) + echo "Unknown command. Repeating questions." + ;; + esac read -p "Pending step: Setting up environment. Run, skip or quit?" OPT case "$OPT" in R) @@ -66,6 +90,201 @@ main() { exit } +function eal.setup.xr() { + echo "[i] Extracting and renaming ALL packages..." + sleep 0.5 + pushd $LFS/sources/ || einrichter.error DIR404_SRC + tar -xvf gcc-14.2.0.tar.xz + mv -v gcc-14.2.0 gcc + pushd $LFS/sources/gcc + tar -xf ../mpfr-4.2.1.tar.xz + mv -v mpfr-4.2.1 mpfr + tar -xf ../gmp-6.3.0.tar.xz + mv -v gmp-6.3.0 gmp + tar -xf ../mpc-1.3.1.tar.gz + mv -v mpc-1.3.1 mpc + popd + tar -xvf $LFS/sources/binutils-2.43.1.tar.xz + mv binutils-2.43.1 binutils + tar -xvf linux-6.10.5.tar.xz + mv -v linux-6.10.5 linux + tar -xvf glibc-2.40.tar.xz + mv -v glibc-2.40 glibc + tar -xvf coreutils-9.5.tar.xz + mv coreutils-9.5 coreutils + tar -xvf diffutils-3.10.tar.xz + mv diffutils-3.10 diffutils + tar -xvf file-5.45.tar.gz + mv file-5.45 file + tar -xvf m4-1.4.19.tar.xz + mv m4-1.4.19 m4 + tar -xvf ncurses-6.5.tar.gz + mv ncurses-6.5 ncurses + tar -xvf bash-5.2.32.tar.gz + mv bash-5.2.32 bash + tar -xvf findutils-4.10.0.tar.xz + mv findutils-4.10.0 findutils + tar -xvf gawk-5.3.0.tar.*z + mv gawk-5.3.0 gawk + tar -xvf grep-3.11.tar.*z + mv grep-3.11 grep + tar -xvf gzip-1.13.tar.*z + mv gzip-1.13 gzip + tar -xvf make-4.4.1.tar.*z + mv make-4.4.1 make + tar -xvf patch-2.7.6.tar.*z + mv patch-2.7.6 patch + tar -xvf sed-4.9.tar.*z + mv sed-4.9 sed + tar -xvf tar-1.35* + mv tar-1.35 tar + tar -xvf xz-5.6.2.tar.*z + mv xz-5.6.2 xz + tar -xvf gettext*xz + mv gettext-0.22.5 gettext + tar -xvf bison*xz + mv bison-3.8.2 bison + tar -xvf perl*xz + mv perl-5.40.0 perl + tar -xvf Python*xz + mv Python-3.12.5 python + tar -xvf texinfo*xz + mv texinfo-7.1 texinfo + tar -xvf util-linux*.xz + mv util-linux-2.40.2 util-linux + tar -xvf man-pages-6.9.1.tar.xz + mv man-pages-6.9.1.tar.xz man-pages + tar -xvf iana-etc-20240806.tar.gz + tar -xvf zlib-1.3.1.tar.gz + mv zlib-1.3.1 zlib + tar -xvf bzip2-1.0.8.tar.gz + mv bzip2-1.0.8 bzip2 + tar -xvf lz4-1.10.0.tar.gz + mv lz4-1.10.0 lz4 + tar -xvf zstd-1.5.6.tar.gz + mv zstd-1.5.6 zstd + tar -xvf readline-8.2.13.tar.gz + mv readline-8.2.13 readline + tar -xvf bc-6.7.6.tar.xz + mv bc-6.7.6 bc + tar -xvf flex-2.6.4.tar.gz + mv flex-2.6.4 flex + tar -xvf tcl8.6.14-src.tar.gz + mv tcl8.6.14 tcl + tar -xvf expect5.45.4.tar.gz + mv expect5.45.4 expect + tar -xvf dejagnu-1.6.3.tar.gz + mv dejagnu-1.6.3 dejagnu + tar -xvf pkgconf-2.3.0.tar.xz + mv pkgconf-2.3.0 pkgconf + tar -xvf gmp-6.3.0.tar.xz + mv gmp-6.3.0 gmp + tar -xvf mpfr-4.2.1.tar.xz + mv mpfr-4.2.1 mpfr + tar -xvf mpc-1.3.1.tar.gz + mv mpc-1.3.1 mpc + tar -xvf attr-2.5.2.tar.gz + mv attr-2.5.2 attr + tar -xvf acl-2.3.2.tar.xz + mv acl-2.3.2 acl + tar -xvf libcap-2.70.tar.xz + mv libcap-2.70 libcap + tar -xvf libxcrypt-4.4.36.tar.xz + mv libxcrypt-4.4.36 libxcrypt + tar -xvf shadow-4.16.0.tar.xz + mv shadow-4.16.0 shadow + tar -xvf psmisc-23.7.tar.xz + mv psmisc-23.7 psmisc + tar -xvf libtool-2.4.7.tar.xz + mv libtool-2.4.7 libtool + tar -xvf gdbm-1.24.tar.gz + mv gdbm-1.24 gdbm + tar -xvf gperf-3.1.tar.gz; + mv gperf-3.1 gperf + tar -xvf expat-2.6.4.tar.xz; + mv expat-2.6.4 expat + tar -xvf inetutils-2.5.tar.xz + mv inetutils-2.5 inetutils + tar -xvf less-661.tar.gz; + mv less-661 less + tar -xvf XML-Parser-2.47.tar.gz; + mv XML-Parser-2.47 XML-Parser + tar -xvf intltool-0.51.0.tar.gz; + mv intltool-0.51.0 intltool + tar -xvf autoconf-2.72.tar.xz; + tar -xvf automake-1.17.tar.xz; + mv autoconf-2.72 autoconf; + mv automake-1.17 automake + tar -xvf openssl-3.3.1.tar.gz; + mv openssl-3.3.1 openssl + tar -xvf kmod-33.tar.xz; + mv kmod-33 kmod + tar -xvf elfutils-0.191.tar.bz2; + mv elfutils-0.191 elfutils + tar -xvf libffi-3.4.6.tar.gz; + mv libffi-3.4.6 libffi + tar -xvf flit_core-3.9.0.tar.gz; + mv flit_core-3.9.0 flit_core + tar -xvf wheel-0.44.0.tar.gz; + mv wheel-0.44.0 wheel + tar -xvf setuptools-72.2.0.tar.gz; + mv setuptools-72.2.0 setuptools + tar -xvf ninja-1.12.1.tar.gz; + mv ninja-1.12.1 ninja + tar -xvf meson-1.5.1.tar.gz; + mv meson-1.5.1 meson + tar -xvf check-0.15.2.tar.gz; + mv check-0.15.2 check + tar -xvf groff-1.23.0.tar.gz; + mv groff-1.23.0 groff + tar -xvf grub-2.12.tar.xz; + mv grub-2.12 grub + tar -xvf iproute2-6.10.0.tar.xz; + mv iproute2-6.10.0 iproute2 + tar -xvf kbd-2.6.4.tar.xz; + mv kbd-2.6.4 kbd + tar -xvf libpipeline-1.5.7.tar.gz; + mv libpipeline-1.5.7 libpipeline + tar -xvf nano-8.1.tar.xz; + mv nano-8.1 nano + tar -xvf MarkupSafe-2.1.5.tar.gz; + mv MarkupSafe-2.1.5 MarkupSafe + tar -xvf jinja2-3.1.4.tar.gz; + mv jinja2-3.1.4 jinja + tar -xvf systemd-256.4.tar.gz; + mv systemd-256.4 systemd + tar -xvf dbus-1.14.10.tar.xz; + mv dbus-1.14.10 dbus + tar -xvf man-db-2.12.1.tar.xz; + mv man-db-2.12.1 man-db + tar -xvf procps-ng-4.0.4.tar.xz; + mv procps-ng-4.0.4 procps-ng + tar -xvf e2fsprogs-1.47.1.tar.gz; + mv e2fsprogs-1.47.1 e2fsprogs + tar -xvf git-2.48.1.tar.xz + mv git-2.48.1 git + tar -xvf wget-1.24.5.tar.gz + mv wget-1.24.5 wget + tar -xvf p11-kit-0.25.5.tar.xz + mv p11-kit-0.25.5 p11-kit + tar -xvf make-ca-1.14.tar.gz + mv make-ca-1.14 make-ca + tar -xvf libtasn1-4.19.0.tar.gz + mv libtasn1-4.19.0 libtasn1 + tar -xvf cpio-2.15.tar.bz2 + mv cpio-2.15 cpio + tar -xvf hwdata-0.385.tar.gz + mv hwdata-0.385 hwdata + tar -xvf pciutils-3.13.0.tar.gz + mv pciutils-3.13.0 pciutils + tar -xvf libgpg-error-1.50.tar.bz2 + mv libgpg-error-1.50 libgpg-error + tar -xvf libassuan-3.0.1.tar.bz2 + mv libassuan-3.0.1 libassaun + tar -xvf gpgme-1.23.2.tar.bz2 + mv gpgme-1.23.2 gpgme +} + function eal.setup.env() { echo "The installer is about to begin setting up the environment. Please wait..." sleep 2 @@ -305,8 +524,7 @@ function eal.install.toolchain() { ./configure --prefix=/usr \ --build=$(sh support/config.guess) \ --host=$LFS_TGT \ - --without-bash-malloc \ - bash_cv_strtold_broken=no + --without-bash-malloc eal.notification.compiling make eal.notification.installing @@ -341,18 +559,19 @@ function eal.install.toolchain() { make DESTDIR=$LFS install popd pushd $LFS/sources/file - mkdir build - pushd build - ../configure --disable-bzlib \ - --disable-libseccomp \ - --disable-xzlib \ - --disable-zlib - make + mkdir build + pushd build + ../configure --disable-bzlib \ + --disable-libseccomp \ + --disable-xzlib \ + --disable-zlib + make + popd + ./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess) + make FILE_COMPILE=$(pwd)/build/src/file + make DESTDIR=$LFS install + rm -v $LFS/usr/lib/libmagic.la popd - ./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess) - make FILE_COMPILE=$(pwd)/build/src/file - make DESTDIR=$LFS install - rm -v $LFS/usr/lib/libmagic.la pushd $LFS/sources/findutils ./configure --prefix=/usr \ --localstatedir=/var/lib/locate \ @@ -424,7 +643,7 @@ function eal.install.toolchain() { popd pushd $LFS/sources/binutils sed '6009s/$add_dir//' -i ltmain.sh - yes | rm -r build + rm -rf build mkdir -v build cd build ../configure \ @@ -452,7 +671,7 @@ function eal.install.toolchain() { esac sed '/thread_header =/s/@.*@/gthr-posix.h/' \ -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in - yes | rm -r build + rm -rf build mkdir -v build cd build eal.notification.buildconf diff --git a/Einrichter-in-chroot.sh b/Einrichter-in-chroot.sh index 04a4de0..f9a0259 100755 --- a/Einrichter-in-chroot.sh +++ b/Einrichter-in-chroot.sh @@ -343,7 +343,7 @@ EOF unset ZONEINFO eic.system.build.tz() { tzselect - read -p "[i] Type the timezone that has been outputted: (with the slash) " TZ + read -p "[i] Type the timezone that has been outputted (with the slash): " TZ ln -sfv /usr/share/zoneinfo/$TZ /etc/localtime || eic.system.build.tz } eic.system-build.tz @@ -482,7 +482,7 @@ EOF eic.system.build.expect.intervention() { if [[ $(python3 -c 'from pty import spawn; spawn(["echo", "ok"])') != "ok" ]]; then echo "[i] PS: The error is caused by the chroot environment not being set up for proper PTY operation." - read -p "[!] Answer unexpected. Continue, enter shell or quit? [c/s/q] " OPT + read -p "[!] Answer unexpected. Continue, enter shell or quit? [c/s/q]: " OPT case "$OPT" in c) echo "OK!" @@ -570,7 +570,7 @@ EOF eic.system.build.gmp.intervention() { if [ ! "$GMP_CHECK" -ge "199" ]; then echo "[i] PS: The check did not reach the minimum amount of passed tests required." - read -p "[!] Answer unexpected. Continue, enter shell or quit? [c/s/q] " OPT + read -p "[!] Answer unexpected. Continue, enter shell or quit? [c/s/q]: " OPT case "$OPT" in c) echo "OK!" @@ -724,7 +724,7 @@ function eic.system.build.gcc() { -e '/GOTPCREL/d' -i ../gcc/testsuite/gcc.target/i386/fentryname3.c eic.system.build.gcc.ask() { - read -p "Pending step: Running test suite. Run, skip or quit?" OPT + read -p "Pending step: Running test suite. Run, skip or quit? [R/S/Q]: " OPT case "$OPT" in R) chown -R tester . @@ -815,7 +815,7 @@ function eic.system.build.continue() { --docdir=/usr/share/doc/gettext-0.22.5 make eic.system.build.continue.gettext.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) make check > /eilogs/8.33-gettext-test.log @@ -840,7 +840,7 @@ function eic.system.build.continue() { ./configure --prefix=/usr --docdir=/usr/share/doc/bison-3.8.2 make eic.system.build.continue.bison.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) make check > /eilogs/8.34-bison-test.log @@ -875,7 +875,7 @@ function eic.system.build.continue() { --docdir=/usr/share/doc/bash-5.2.32 make eic.system.build.continue.bash.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) chown -R tester . @@ -975,7 +975,7 @@ EOF make make install eic.system.build.continue.perl.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) TEST_JOBS=$(nproc) make test_harness > /eilogs/8.43-perl-test.log @@ -1014,7 +1014,7 @@ EOF ./configure --prefix=/usr make eic.system.build.continue.autoconf.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) make check > /eilogs/8.46-autoconf-test.log @@ -1038,7 +1038,7 @@ EOF ./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.17 make eic.system.build.continue.automake.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) make -j$(($(nproc)>4?$(nproc):4)) check > /eilogs/8.47-automake-test.log @@ -1112,7 +1112,7 @@ EOF --enable-optimizations make eic.system.build.continue.python.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) make test TESTOPTS="--timeout 120" > /eilogs/8.52-python-test.log @@ -1259,7 +1259,7 @@ if ( j > 0 ) return j;\ ./configure --prefix=/usr make eic.system.build.continue.make.ask() { - read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs)" OPT + read -p "Pending step: Running test suite. Run, skip or quit? (~3 SBUs) [R/S/Q]: " OPT case "$OPT" in R) chown -R tester . @@ -1958,12 +1958,12 @@ MaxUse=$1" > /etc/systemd/coredump.conf.d/maxuse.conf function eic.linux.install() { pushd /sources/linux/ - read -p "[i] In this section, it is recommended to have the TylkoLinux build/installation guide open and ready. [ENTER]" + read -p "[i] In this section, it is recommended to have the TylkoLinux build/installation guide open and ready. [ENTER]: " make mrproper # make menuconfig make make modules_install - read -p "[i] Mount boot partition? : " OPT + read -p "[i] Mount boot partition? [Y/N]: " OPT case $OPT in Y|y|Yes|yes|YES) mount /boot @@ -2435,7 +2435,7 @@ EOF make make install popd - read -p "[?] Disable systemd-networkd? [Y/N]" OPT + read -p "[?] Disable systemd-networkd? [Y/N]: " OPT case "$OPT" in y|Y|Yes|yes|YES) systemctl disable --now systemd-networkd @@ -2848,7 +2848,7 @@ function eic.dnf4.install.DONOTUSE() { function eic.tdnf.install() { pushd /sources/ echo "[?] Is RPM installed? Because if not, the packages will NOT install!" - read -p "[Y]es, it is. [N]o, it isn't." opt + read -p "[Y]es, it is. [N]o, it isn't. :" opt case "$opt" in Y|y|Yes|yes|YES) echo "[i] Checking...." @@ -2938,7 +2938,7 @@ function eic.error() { echo "[!] Directory /sources/ does NOT exist!" ;; RPM_NOT_INSTALLED) - echo "[!] RPM...is not installed." + echo "[!] RPM...is not installed. You liar." exit 1 ;; *)