Minor changes on output of postinstall-scripts/update-all-packages

diff --git a/postinstall-scripts/update-all-packages b/postinstall-scripts/update-all-packages
index 136061735c5b4aea742460e99402adf1cc6d830d..e9dd742c9814f547636ea44261e92535e885835f 100755 (executable)
--- a/postinstall-scripts/update-all-packages
+++ b/postinstall-scripts/update-all-packages
@@ -140,6 +140,7 @@ do_el_upgrade() {
 
     local tool="$1"
 
+    empty_line
     info "Performing dist upgrade with ${GREEN}${tool}${NORMAL} ..."
     info "Tweaking '/etc/yum.conf' ..."
 
@@ -180,24 +181,31 @@ ok==1 {print "ip_resolve=4"; ok=0}
         fi
     fi
 
-    local verbose_opt=""
-    if [[ "${VERBOSE}" == "y" ]] ; then
-         verbose_opt=" --verbose"
-    fi
-
     echo
     info "Cleaning ..."
-    exec_cmd ${tool} --assumeyes clean all
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --verbose --assumeyes clean all
+    else
+        exec_cmd ${tool} --assumeyes clean all
+    fi
 
     echo
     info "Making cache ..."
-    exec_cmd ${tool} --assumeyes makecache
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --assumeyes makecache
+    else
+        exec_cmd ${tool} --verbose --assumeyes makecache
+    fi
 
     echo
     info "Removing cloud-init ..."
     if rpm -qa | grep --quiet --perl-regexp '^cloud-init-\d' ; then
-        exec_cmd ${tool}  --assumeyes erase cloud-init
-        RM -rf /etc/sysconfig/network-scripts/* /etc/sysconfig/network-scripts/.*
+        if [[ "${VERBOSE}" == "y" ]] ; then
+            exec_cmd ${tool} --verbose --assumeyes erase cloud-init
+        else
+            exec_cmd ${tool} --assumeyes erase cloud-init
+        fi
+        RM -rf /etc/sysconfig/network-scripts/* /etc/sysconfig/network-scripts/.* /home/cloud-init
         sleep 1
     fi
 
@@ -223,21 +231,37 @@ ok==1 {print "ip_resolve=4"; ok=0}
 
     echo
     info "Doing upgrade ..."
-    exec_cmd ${tool} --assumeyes upgrade
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --verbose --assumeyes upgrade
+    else
+        exec_cmd ${tool} --assumeyes upgrade
+    fi
 
     empty_oracle_repo_files || true
 
     echo
     info "Cleaning again ..."
-    exec_cmd ${tool} --assumeyes clean all
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --verbose --assumeyes clean all
+    else
+        exec_cmd ${tool} --assumeyes clean all
+    fi
 
     echo
     info "Making cache again ..."
-    exec_cmd ${tool} --assumeyes makecache
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --verbose --assumeyes makecache
+    else
+        exec_cmd ${tool} --assumeyes makecache
+    fi
 
     echo
     info "Removing pointless stuff ..."
-    exec_cmd ${tool} --assumeyes autoremove
+    if [[ "${VERBOSE}" == "y" ]] ; then
+        exec_cmd ${tool} --verbose --assumeyes autoremove
+    else
+        exec_cmd ${tool} --assumeyes autoremove
+    fi
 
 }