[gentoo-commits] proj/livecd-tools:master commit in: init.d/

[William Hubbs]

commit:     f672cb58a56638c9df5695015742aa3b2c37f2e8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar 15 04:30:30 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 04:33:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=f672cb58

autoconfig: fix the indentation

 init.d/autoconfig | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 715350e..848a102 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -386,22 +386,23 @@ start() {
        ebegin "Starting autoconfig"
        echo "0" > /proc/sys/kernel/printk
        get_config
+
        local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
        eindent
        ebegin "Setting sane defaults in /etc/portage/make.conf"
-               if [ -f "/etc/portage/make.conf" ] && checkpath -W 
/etc/portage/make.conf; then
-                       if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' 
/etc/portage/make.conf; then
-                               printf 
"EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} 
--load-average=${numcpu}\"\n" >> /etc/portage/make.conf
-                       fi
-               elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d 
"/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
+       if [ -f "/etc/portage/make.conf" ] && checkpath -W 
/etc/portage/make.conf; then
+               if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' 
/etc/portage/make.conf; then
                        printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} 
--jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
-               elif [ -d "/etc/portage/make.conf" ]; then
-                       if [ ! -f 
"/etc/portage/make.conf/livecd-tools-autoconfig" ] && checkpath -W 
/etc/portage/make.conf/livecd-tools-autoconfig; then
-                               printf 
"EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} 
--load-average=${numcpu}\"\n" >> /etc/portage/make.conf/livecd-tools-autoconfig
-                       fi
-               else
-                       false
                fi
+       elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d 
"/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
+               printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} 
--jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+       elif [ -d "/etc/portage/make.conf" ]; then
+               if [ ! -f "/etc/portage/make.conf/livecd-tools-autoconfig" ] && 
checkpath -W /etc/portage/make.conf/livecd-tools-autoconfig; then
+                       printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} 
--jobs=${numcpu} --load-average=${numcpu}\"\n" >> 
/etc/portage/make.conf/livecd-tools-autoconfig
+               fi
+       else
+               false
+       fi
        eend $? "Unable to write to /etc/portage/make.conf"
        eoutdent