From 55e227e64c5bf539f3c21342cd50ff65e42a9c19 Mon Sep 17 00:00:00 2001
From: Urban Wallasch <urban.wallasch@freenet.de>
Date: Thu, 16 Apr 2020 12:47:28 +0200
Subject: [PATCH] * Improved output about action being performed and result
 status.

---
 XbpsUI.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/XbpsUI.sh b/XbpsUI.sh
index 2adf5e0..bf92d92 100755
--- a/XbpsUI.sh
+++ b/XbpsUI.sh
@@ -104,23 +104,25 @@ fi
 
 # Update repository package database:
 function syncRepo() {
+    echo -e "\nUpdate package lists ..."
     $SUDO xbps-install -Sv
 }
 
 # Update all installed packages to their latest version:
 function distUpgrade() {
+    echo -e "\nUpgrade all packages ..."
     $SUDO xbps-install -Suv
 }
 
 # Clean cache by removing obsolete binary packages:
 function cleanCache() {
-    echo "Cleaning package cache ..."
+    echo -e "\nCleaning package cache ..."
     $SUDO xbps-remove -Ov
 }
 
 # Remove orphaned packages:
 function reapOrphans() {
-    echo "Searching for orphans ..."
+    echo -e "\nSearching for orphans ..."
     $SUDO xbps-remove -ov
 }
 
@@ -153,8 +155,8 @@ function instPkg() {
                 --header="Select packages to install.$fzfHint" |
             awk '{print $2}'
         )"
+    echo -e "\nInstall:"
     if [[ -n "$pkg" ]] ; then
-        echo "Install:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-install -v -S $pkg
@@ -173,8 +175,8 @@ function reinstPkg() {
                 --header="Select packages to reinstall.$fzfHint" |
             awk '{print $2}'
         )"
+    echo -e "\nReinstall:"
     if [[ -n "$pkg" ]] ; then
-        echo "Reinstall:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-install -v -f -S $pkg
@@ -194,8 +196,8 @@ function purgePkg() {
             awk '{print $2}'
         )"
 
+    echo -e "\nPurge:"
     if [[ -n "$pkg" ]] ; then
-        echo "Purge:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-remove -v -R $pkg
@@ -215,8 +217,8 @@ function reconfPkg() {
             awk '{print $2}'
         )"
 
+    echo -e "\nReconfigure:"
     if [[ -n "$pkg" ]] ; then
-        echo "Reconfigure:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-reconfigure -f -v $pkg
@@ -235,8 +237,8 @@ function holdPkg() {
                 --header="Select packages to put on hold.$fzfHint"
         )"
 
+    echo -e "\nPut on hold:"
     if [[ -n "$pkg" ]] ; then
-        echo "Put on hold:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-pkgdb -v -m hold $pkg
@@ -254,8 +256,8 @@ function unholdPkg() {
                 --header="Select packages to unhold.$fzfHint"
         )"
 
+    echo -e "\nUnhold held packages:"
     if [[ -n "$pkg" ]] ; then
-        echo "Unhold held packages:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-pkgdb -v -m unhold $pkg
@@ -274,8 +276,8 @@ function markPkgManual() {
                 --header="Select packages to mark as manual.$fzfHint"
         )"
 
+    echo -e "\nMarking as manually installed:"
     if [[ -n "$pkg" ]] ; then
-        echo "Marking as manually installed:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-pkgdb -v -m manual $pkg
@@ -293,8 +295,8 @@ function markPkgAuto() {
                 --header="Select packages to mark as as auto.$fzfHint"
         )"
 
+    echo -e "\nMarking as automatically installed:"
     if [[ -n "$pkg" ]] ; then
-        echo "Marking as automatically installed:"
         echo "$pkg"
         pkg="$( echo "$pkg" | paste -sd " " )"
         $SUDO xbps-pkgdb -v -m auto $pkg
@@ -399,9 +401,9 @@ quit        Quit" |
 function statrep() {
     echo
     case "$1" in
-         0 ) echo -e "\e[42m [OK] \e[0m" ;;
-        42 ) echo -e "\e[7m [NO CHANGES REQUESTED] \e[0m" ;;
-         * ) echo -e "\e[41m [FAILED] \e[0m" ;;
+         0 ) echo -e "\e[49;32mOK\e[0m" ;;
+        42 ) echo -e "\e[1mNo changes requested.\e[0m" ;;
+         * ) echo -e "\e[49;31mFAILED! (exit code $1)\e[0m" ;;
     esac
     echo "Press any key to continue ..."
     read -sn1
-- 
2.30.2