[PC-BSD Commits] r13820 - pcbsd/current/src-sh/pc-updatemanager/scripts

[svn at pcbsd.org]

Author: kris
Date: 2011-11-11 10:20:51 -0800 (Fri, 11 Nov 2011)
New Revision: 13820

Modified:
   pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
   pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2
Log:

Update the system upgrade script to make them more verbose during the pkg_add / pkg_delete
phases




Modified: pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2011-11-11 16:42:24 UTC (rev 13819)
+++ pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2011-11-11 18:20:51 UTC (rev 13820)
@@ -18,18 +18,25 @@
 
 
 # Start by cleaning old pkg's
-echo -e "Cleaning system pkgs...\c"
+echo "Cleaning old system pkgs..."
 
-# Create the pkg-list
+# Create the pkg list
 pkg_info > /tmp/.pkg-remove.$$
+
+# Delete the pkgs
 while read line
 do
   dPkg=`echo $line | cut -d ' ' -f 1`
+
+  printf "\r%-${length}s\r"
+  printf "%-${length}s\r" "${dPkg}"
+  length=${#dPkg}
+
   pkg_delete -f "${dPkg}" >/dev/null 2>/dev/null
-  echo -e '.\c'
+
 done < /tmp/.pkg-remove.$$
 rm /tmp/.pkg-remove.$$
-echo "DONE"
+echo ""
 
 # Start extracting the updated world now
 echo -e "Extracting updated world environment...\c"

Modified: pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2	2011-11-11 16:42:24 UTC (rev 13819)
+++ pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2	2011-11-11 18:20:51 UTC (rev 13820)
@@ -16,25 +16,30 @@
 echo "##############################################################"
 
 # Install new pkgs
-echo -e "Installing meta-pkgs...\c"
+echo "Installing system packages..."
 cd "${STAGEDIR}/packages"
 for i in `ls *.tbz`
 do
   echo "$i" | grep -q -e "nvidia"
   if [ $? -eq 0 ] ; then continue ; fi
 
+  printf "\r%-${length}s\r"
+  printf "%-${length}s\r" "${i}"
+  length=${#i}
+
   pkg_add -f "$i" >/dev/null 2>/dev/null
-  echo -e ".\c"
 done
 
 # Load any nvidia drivers last
 for i in `ls *nvidia*.tbz`
 do
   pkg_add -f "$i" >/dev/null 2>/dev/null
-  echo -e ".\c"
+  printf "\r%-${length}s\r"
+  printf "%-${length}s\r" "${i}"
+  length=${#i}
 done
 
-echo -e "DONE"
+echo ""
 cd /
 
 # Copy over the regular rc again