diff --git a/os-upgrade.sh b/os-upgrade.sh index 9fcd656..3602070 100755 --- a/os-upgrade.sh +++ b/os-upgrade.sh @@ -56,9 +56,9 @@ echononl(){ if $terminal ; then echo X\\c > /tmp/shprompt$$ if [ `wc -c /tmp/shprompt$$ | awk '{print $1}'` -eq 1 ]; then - echo -e -n "[ \033[5m\033[1m...\033[m ]\033[13G$*\\c" 1>&2 + echo -e -n "[ \033[5m\033[1m....\033[m ]\033[13G$*\\c" 1>&2 else - echo -e -n "[ \033[5m\033[1m...\033[m ]\033[13G$*" 1>&2 + echo -e -n "[ \033[5m\033[1m....\033[m ]\033[13G$*" 1>&2 fi rm /tmp/shprompt$$ fi @@ -271,6 +271,11 @@ packages_updated="$(apt-get -V -s dist-upgrade | grep -E "^ .*=>.*" | awk '{pr blank_line echononl "Upgrade Packages" +if ! $terminal && [[ -n "$packages_updated" ]] ; then + echo "" + echo " Upgrade Packages.." + echo " apt-get dist-upgrade" +fi echo_print_command "apt-get dist-upgrade" if $terminal; then echo -e "\033[2A" @@ -286,18 +291,27 @@ if [[ -n "$packages_updated" ]]; then else echo_done echo - echo " This packages have been updated:" + echo + if $terminal ; then + echo -e "\033[13G\033[33mThis packages have been updated:\033[m" + else + echo " This packages have been updated:" + fi echo "[ $(date +%Y-%d-%m" "%H:%M) ] This packages have been updated:" >> "$updated_packages_log" for _package in $packages_updated ; do if $terminal ; then - echo -e " \033[1m$_package\033[m" + echo -e "\033[13G \033[1m$_package\033[m" else - echo -e " $_package\033[m" + echo " $_package\033[m" fi echo " $_package" >> "$updated_packages_log" done echo "" - echo " See also: $updated_packages_log" + if $terminal ; then + echo -e "\033[13GSee also: updated_packages_log" + else + echo " See also: $updated_packages_log" + fi echo "" echo "" >> "$updated_packages_log" fi @@ -354,9 +368,15 @@ rc_packages="$(dpkg --list | awk '/^rc/ { print $2 }')" blank_line if $terminal; then - echo -e "\033[13GRemove (purge) packages with only config files installed (rc):" + echo -e "[ \033[5m\033[1m....\033[m ]\033[13GRemove (purge) packages with only config files installed (rc):" echo -en "\033[13G\033[1mapt-get purge \$(dpkg --list | awk '/^rc/ { print $2 }')\033[m" echo -e "\033[2A" +else + if [[ -n "$rc_packages" ]] ; then + echo "" + echo " Remove (purge) packages with only config files installed (rc).." + echo " apt-get purge \$(dpkg --list | awk '/^rc/ { print $2 }')" + fi fi if [[ -n "$rc_packages" ]] ; then apt-get purge -y $(dpkg --list | awk '/^rc/ { print $2 }') > $log_file 2>&1 @@ -369,14 +389,27 @@ apt-get purge -y $(dpkg --list | awk '/^rc/ { print $2 }') > $log_file 2>&1 else echo_done echo - echo " This packages with only config files installed have been removed:" + echo + if $terminal ; then + echo -e "\033[13G\033[33mThis packages with only config files installed have been removed:\033[m" + else + echo " This packages with only config files installed have been removed:" + fi echo "[ $(date +%Y-%d-%m" "%H:%M) ] This packages with only config files installed have been removed:" >> "$removed_packages_log" for _package in $rc_packages ; do - echo -e " \033[1m$_package\033[m" + if $terminal; then + echo -e "\033[13G \033[1m$_package\033[m" + else + echo " $_package" + fi echo " $_package" >> "$removed_packages_log" done echo "" - echo " See also: $removed_packages_log" + if $terminal ; then + echo -e "\033[13GSee also: $removed_packages_log" + else + echo " See also: $removed_packages_log" + fi echo "" echo "" >> "$removed_packages_log"