upgrayyedd: better thread calculation

diff --git a/dot-local/bin/upgrayyedd b/dot-local/bin/upgrayyedd
index 5d5ab21c0acaead18f5361b177e5d4591817d8ad..7e21196b8cceed5c11084f6ed82c804bb6f99af0 100755 (executable)
--- a/dot-local/bin/upgrayyedd
+++ b/dot-local/bin/upgrayyedd
@@ -7,9 +7,9 @@ source /etc/portage/make.conf
 
 if [[ $(id -u) -ne 0 ]];
 then
-    export precmd="sudo"
+    export precmd="sudo MAKEOPTS=-j$(echo $(nproc) -4 | bc)"
 else
-    export precmd=""
+    export precmd="MAKEOPTS=-j$(echo $(nproc) -4 | bc)"
 fi
 
 case "$1" in
@@ -48,7 +48,7 @@ case "$1" in
                sudo cp "/usr/src/config-gentoo" "./.config" || exit 1
                sudo schedtool -B -n \-19 -e make oldconfig
                sudo schedtool -B -n \-19 -e make modules_prepare
-               sudo schedtool -B -n \-19 -e make -j$(nproc) || exit 1
+               sudo schedtool -B -n \-19 -e make -j$(echo $(nproc) -4 | bc) || exit 1
                sudo emerge @module-rebuild
                sudo schedtool -B -n \-19 -e make modules_install
                sudo schedtool -B -n \-19 -e make install
@@ -66,7 +66,7 @@ case "$1" in
                sudo cp "/usr/src/config-gentoo" "./.config" || exit 1
                sudo schedtool -B -n \-19 -e make oldconfig
                sudo schedtool -B -n \-19 -e make modules_prepare
-               sudo LLVM=1 LLVM_IAS=1 LDFLAGS="${LDFLAGS} -fuse-ld=mold" schedtool -B -n \-19 -e make -j$(nproc) || exit 1
+               sudo LLVM=1 LLVM_IAS=1 LDFLAGS="${LDFLAGS} -fuse-ld=mold" schedtool -B -n \-19 -e make -j$(echo $(nproc) -4 | bc) || exit 1
                sudo emerge @module-rebuild
                sudo schedtool -B -n \-19 -e make modules_install
                sudo schedtool -B -n \-19 -e make install
@@ -85,7 +85,7 @@ case "$1" in
                sudo cp "/usr/src/config-git" "./.config" || exit 1
                sudo schedtool -B -n \-19 -e make oldconfig
                sudo schedtool -B -n \-19 -e make modules_prepare
-               sudo schedtool -B -n \-19 -e make -j$(nproc) || exit 1
+               sudo schedtool -B -n \-19 -e make -j$(echo $(nproc) -4 | bc) || exit 1
                sudo emerge @module-rebuild
                sudo schedtool -B -n \-19 -e make modules_install
                sudo schedtool -B -n \-19 -e make install
@@ -104,7 +104,7 @@ case "$1" in
                sudo cp "/usr/src/config-server" "./.config" || exit 1
                sudo schedtool -B -n \-19 -e make oldconfig
                sudo schedtool -B -n \-19 -e make modules_prepare
-               sudo schedtool -B -n \-19 -e make -j$(nproc) || exit 1
+               sudo schedtool -B -n \-19 -e make -j$(echo $(nproc) -4 | bc) || exit 1
                sudo emerge @module-rebuild
                sudo schedtool -B -n \-19 -e make modules_install
                sudo schedtool -B -n \-19 -e make install
@@ -123,6 +123,7 @@ case "$1" in
         ;;
     testify)
         echo "${@:2}"
+        echo "$precmd"
         ;;
     *)
         echo "Currently available commands: 'refresh', 'again', 'skipkernel', 'clean', 'log', 'kernel-gentoo', 'kernel-llvm', 'kernel-git', 'kernel-server', 'clean-kernels'"