Made pkg deinstallation more quiet.

 Changes to be committed:
	modified:   lib/libmain.sh
	modified:   lib/libpkgsys.sh

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 8603088..d022674 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180807004844
+       MYVERSION=4.0.0+toward_4.1.0_20180807122350
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 7b3d4dd..0bc2eaf 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -472,20 +472,22 @@ pkgsys_def_pkgtools ()
                }
                pkg_delete_f ()
                {
-                       local opt_del opt_quit dev_err
+                       local opt_del opt_quit dev_out dev_err
                        opt_del=
                        [ $no_exec_inst_script = yes ] && opt_del='-D'
                        opt_quit=
+                       dev_out=/dev/stdout
                        dev_err=/dev/stderr
                        if [ $opt_batch_mode = yes ]
                        then
                                opt_quit='-q'
+                               dev_out=/dev/null
                                dev_err=/dev/null
                        fi
-                       pkg delete -fqy $opt_del $opt_quit "$@" 2> $dev_err
+                       pkg delete -fqy $opt_del "$@" > $dev_out 2> $dev_err || :
                        pkg_is_tool_ready || return 0   # If pkg(8) is deinstalled successfully
-                       pkg info -e $opt_quit "$@" > /dev/null 2>&1 || return 0 # Countermeasure for a bug found for pkg-1.3.4 (at least not until 1.2.7_4)
-                       pkg delete -fy $opt_del $opt_quit "$@" 2> $dev_err
+                       pkg info -e $opt_quit "$@" > /dev/null 2>&1 || return 0
+                       pkg delete -fy $opt_del "$@" > $dev_out 2> $dev_err     # Countermeasure for a bug found for pkg-1.3.4 (at least not until 1.2.7_4)
                }
                pkg_add_tools ()
                {