The batch mode is made more quite about package tools operations.

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

diff --git a/lib/libmain.sh b/lib/libmain.sh
index beda4db..1995b6d 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_20180805150658
+       MYVERSION=4.0.0+toward_4.1.0_20180806094000
        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 72104e3..04d6bb8 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -340,13 +340,21 @@ pkgsys_def_pkgtools ()
                }
                pkg_is_tool_available ()
                {
+                       local dev_out dev_err
                        if [ -x /usr/sbin/pkg ]
                        then
-                               pkg -N 2> /dev/null && return
-                               env ASSUME_ALWAYS_YES=yes pkg bootstrap -f
-                               pkg -N 2> /dev/null
+                               dev_out=/dev/stdout
+                               dev_err=/dev/stderr
+                               if [ $opt_batch_mode = yes ]
+                               then
+                                       dev_out=/dev/null
+                                       dev_err=/dev/null
+                               fi
+                               pkg_is_tool_ready && return
+                               env ASSUME_ALWAYS_YES=yes pkg bootstrap -f > $dev_out 2> $dev_err
+                               pkg_is_tool_ready
                        else
-                               which -s pkg && return
+                               which -s pkg
                        fi
                }
                pkg_info_Ea ()
@@ -379,11 +387,11 @@ pkgsys_def_pkgtools ()
                }
                pkg_info_e ()
                {
-                       pkg info -e "$@" 2> /dev/null
+                       pkg info -qe "$@" 2> /dev/null
                }
                pkg_info_eO ()
                {
-                       pkg info -eO "$@" 2> /dev/null
+                       pkg info -qeO "$@" 2> /dev/null
                }
                pkg_info_Eg ()
                {
@@ -436,7 +444,7 @@ pkgsys_def_pkgtools ()
                                grep '^[^:]*: missing file ' "$tmp_stderr" | sed 's/^[^:]*: missing file //' || :
                                if grep -q '^pkg: .*: No such file or directory$' "$tmp_stderr" # For the old specification of pkg(8)
                                then
-                                       pkg info -ql "$pkg" | while read filepath
+                                       pkg info -ql "$pkg" 2> /dev/null | while read filepath
                                        do
                                                [ -e "$filepath" ] || echo "$filepath"
                                        done
@@ -452,7 +460,7 @@ pkgsys_def_pkgtools ()
                pkg_info_gen_pkg_origin_table ()
                {
                        #       pkg query -g '%n-%v\t%o' \* 2> /dev/null > ${DBDIR}/installed_ports:pkg_vs_origin.tbl
-                       pkg info -qa | while read pkgname
+                       pkg info -qa 2> /dev/null | while read pkgname
                        do
                                origin=`pkg_info_flavored_origin "$pkgname"`
                                printf '%s\t%s\n' "$pkgname" "$origin"
@@ -464,24 +472,38 @@ pkgsys_def_pkgtools ()
                }
                pkg_delete_f ()
                {
-                       local opt_del
+                       local opt_del opt_quit dev_err
                        opt_del=
                        [ $no_exec_inst_script = yes ] && opt_del='-D'
-                       pkg delete -fqy $opt_del "$@"
-                       pkg -N 2> /dev/null || return 0 # If pkg(8) is deinstalled successfully
-                       pkg info -e "$@" || 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=
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               opt_quit='-q'
+                               dev_err=/dev/null
+                       fi
+                       pkg delete -fqy $opt_del $opt_quit "$@" 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_add_tools ()
                {
-                       local pkgarc tmp_extract prefix prefix_parent pkg
+                       local pkgarc tmp_extract prefix prefix_parent pkg opt_quit dev_err
                        pkgarc=$1
                        tmp_extract=${TMPDIR}/pkgng:pkg_add_tools:extract
+                       opt_quit=
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               opt_quit='-q'
+                               dev_err=/dev/null
+                       fi
                        rm -rf "$tmp_extract"
                        mkdir "$tmp_extract"
                        tar xf "$pkgarc" -C "$tmp_extract"
                        pkg=`pkgsys_pkgarc_to_pkgname "$pkgarc"`
-                       if env ASSUME_ALWAYS_YES=YES $tmp_extract/usr/local/sbin/pkg-static add "$pkgarc"
+                       if env ASSUME_ALWAYS_YES=YES $tmp_extract/usr/local/sbin/pkg-static add $opt_quit "$pkgarc" 2> $dev_err
                        then
                                message_echo "INFO: $pkg is successfully registered."
                        else
@@ -491,7 +513,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_add_f ()
                {
-                       local pkgarc pkg pkg_tool pkg_gen opt_add
+                       local pkgarc pkg pkg_tool pkg_gen opt_add opt_quit dev_err
                        pkg_tool=
                        pkg_gen=
                        for pkgarc in "$@"
@@ -511,7 +533,14 @@ pkgsys_def_pkgtools ()
                                mkdir -p "${TMPDIR}/pkg_add_f"
                                opt_add=
                                [ $no_exec_inst_script = yes ] && opt_add='-I'
-                               ( cd "${TMPDIR}/pkg_add_f" && ln -s $pkg_gen && env ASSUME_ALWAYS_YES=YES pkg add $opt_add * )
+                               opt_quit=
+                               dev_err=/dev/stderr
+                               if [ $opt_batch_mode = yes ]
+                               then
+                                       opt_quit='-q'
+                                       dev_err=/dev/null
+                               fi
+                               ( cd "${TMPDIR}/pkg_add_f" && ln -s $pkg_gen && env ASSUME_ALWAYS_YES=YES pkg add $opt_quit $opt_add * 2> $dev_err )
                        fi
                }
                pkg_add_fF ()
@@ -523,13 +552,15 @@ pkgsys_def_pkgtools ()
                        local pkg pkgarc
                        pkg=$1
                        pkgarc=`pkgsys_pkgname_to_pkgarc "${PKGNG_PKG_CACHEDIR}" "$pkg"` || return
-                       tar tf "$pkgarc" > /dev/null 2> /dev/null
+                       tar tf "$pkgarc" > /dev/null 2>&1
                }
                pkg_inst_remote_fetch ()
                {
-                       local pkg
+                       local pkg opt_quit
                        pkg=$1
-                       pkg fetch -yU "$pkg"
+                       opt_quit=
+                       [ $opt_batch_mode = yes ] && opt_quit='-q'
+                       pkg fetch -yU $opt_quit "$pkg"
                }
                pkg_inst_remote_verify_fetch ()
                {
@@ -540,7 +571,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_inst_remote ()
                {
-                       local pkg pkgarc opt_add
+                       local pkg pkgarc opt_add opt_quit
                        pkg=$1
                        pkg_inst_remote_verify_fetch "$pkg" || return
                        pkgarc=`pkgsys_pkgname_to_pkgarc "${PKGNG_PKG_CACHEDIR}" "$pkg"` || return
@@ -548,7 +579,9 @@ pkgsys_def_pkgtools ()
                        mkdir -p "${TMPDIR}/pkg_inst_remote"
                        opt_add=
                        [ $no_exec_inst_script = yes ] && opt_add='-I'
-                       ( cd "${TMPDIR}/pkg_inst_remote" && ln -s "$pkgarc" && env ASSUME_ALWAYS_YES=YES pkg add $opt_add * )
+                       opt_quit=
+                       [ $opt_batch_mode = yes ] && opt_quit='-q'
+                       ( cd "${TMPDIR}/pkg_inst_remote" && ln -s "$pkgarc" && env ASSUME_ALWAYS_YES=YES pkg add $opt_quit $opt_add * )
                }
                pkg_inst_wild_verify_pkg ()
                {
@@ -578,7 +611,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_inst_remote_wild ()
                {
-                       local pkg pkgarc opt_add
+                       local pkg pkgarc opt_add dev_out dev_err
                        pkg=$1
                        if pkg_inst_remote_wild_verify_fetch "$pkg"
                        then
@@ -587,11 +620,18 @@ pkgsys_def_pkgtools ()
                                mkdir -p "${TMPDIR}/pkg_inst_remote_wild"
                                opt_add=
                                [ $no_exec_inst_script = yes ] && opt_add='-I'
-                               ( cd "${TMPDIR}/pkg_inst_remote_wild" && ln -s "$pkgarc" && pkg_add -ifF $opt_add * ) || return
+                               dev_out=/dev/stdout
+                               dev_err=/dev/stderr
+                               if [ $opt_batch_mode = yes ]
+                               then
+                                       dev_out=/dev/null
+                                       dev_err=/dev/null
+                               fi
+                               ( cd "${TMPDIR}/pkg_inst_remote_wild" && ln -s "$pkgarc" && pkg_add -ifF $opt_add * > $dev_out 2> $dev_err) || return
                                message_echo "INFO: Trying to convert the installed legacy package to pkgng."
-                               pkg2ng || :
+                               pkg2ng > $dev_out 2> $dev_err || :
                                message_echo "INFO: Checking whether the conversion is successful."
-                               pkg info -e "$pkg"
+                               pkg info -qe "$pkg" 2> /dev/null
                        fi
                }
                pkg_get_remote_repository_version ()
@@ -600,19 +640,19 @@ pkgsys_def_pkgtools ()
                        origin=$1
                        origin_unflavored=`expr "$origin" : '\([^@]*\)'` || return
                        [ -n "$origin_unflavored" ] || return
-                       pkg fetch -qyU "$origin_unflavored" > /dev/null || return
-                       pkg=`pkg rquery -U %n-%v "$origin_unflavored"` || return
+                       pkg fetch -qyU "$origin_unflavored" 2> /dev/null || return
+                       pkg=`pkg rquery -U %n-%v "$origin_unflavored" 2> /dev/null` || return
                        echo "$pkg"
                }
                pkg_get_pkgs_timestamps ()
                {
-                       pkg query '%n-%v\tng-epoch:%t' "$@"
+                       pkg query '%n-%v\tng-epoch:%t' "$@" 2> /dev/null
                }
                pkg_get_pkg_timestamp ()
                {
                        local pkg
                        pkg=$1
-                       pkg query '%t' "$pkg"
+                       pkg query '%t' "$pkg" 2> /dev/null
                }
                pkg_loadconf ()
                {
@@ -647,7 +687,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_rescue_tools ()
                {
-                       local origin_portsmgmt packagepath checksumpath pkgname is_successful
+                       local origin_portsmgmt packagepath checksumpath pkgname is_successful dev_out dev_err
                        origin_portsmgmt=`pkgsys_portsmgmt_pkg`
                        pkg_is_tool_ready && return
                        packagepath=`pkgsys_get_backup_pkg "$origin_portsmgmt"` && \
@@ -664,6 +704,13 @@ pkgsys_def_pkgtools ()
                        grep -Ev '^[[:space:]]*WITH_PKG(|NG)=' /etc/make.conf > ${TMPDIR}/make.conf 2> /dev/null || :
                        echo WITHOUT_PKG=yes >> ${TMPDIR}/make.conf
                        echo WITHOUT_PKGNG=yes >> ${TMPDIR}/make.conf
+                       dev_out=/dev/stdout
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               dev_out=/dev/null
+                               dev_err=/dev/null
+                       fi
                        ( set -e
                                unset WITH_PKG
                                unset WITH_PKGNG
@@ -672,11 +719,11 @@ pkgsys_def_pkgtools ()
                                message_echo "INFO: Attempting deinstallation of pkg(8) to make sure."
                                portsmgmt_port_path=`pkgsys_get_portpath_from_origin "$origin_portsmgmt"`
                                fs_fix_unionfs_image_if_hidden "${TMPDIR}/make.conf"
-                               env __MAKE_CONF="${TMPDIR}/make.conf" make -C "$portsmgmt_port_path" deinstall || :
+                               env __MAKE_CONF="${TMPDIR}/make.conf" make -C "$portsmgmt_port_path" deinstall > $dev_out 2> $dev_err || :
                                message_echo "INFO: Attempting (re)installation by pkg(8)."
-                               env __MAKE_CONF="${TMPDIR}/make.conf" make -C "$portsmgmt_port_path" reinstall clean
+                               env __MAKE_CONF="${TMPDIR}/make.conf" make -C "$portsmgmt_port_path" reinstall clean > $dev_out 2> $dev_err
                        ) && {
-                               pkg2ng || :
+                               pkg2ng > $dev_out 2> $dev_err || :
                                pkg_is_tool_available
                        }
                }
@@ -732,7 +779,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_info_e ()
                {
-                       pkg_info -e "$@" 2> /dev/null
+                       pkg_info -qe "$@" 2> /dev/null
                }
                pkg_info_eO ()
                {
@@ -756,7 +803,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_info_flavor ()
                {
-                       pkg_info -e "$@" 2> /dev/null && echo
+                       pkg_info -qe "$@" 2> /dev/null && echo
                        :
                }
                pkg_info_flavored_origin ()
@@ -795,34 +842,63 @@ pkgsys_def_pkgtools ()
                }
                pkg_create_b ()
                {
-                       pkg_create -b "$@"
+                       local dev_out dev_err
+                       dev_out=/dev/stdout
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               dev_out=/dev/null
+                               dev_err=/dev/null
+                       fi
+                       pkg_create -b "$@" > $dev_out 2> $dev_err
                }
                pkg_delete_f ()
                {
-                       local opt_del
+                       local opt_del dev_out dev_err
                        opt_del=
                        [ $no_exec_inst_script = yes ] && opt_del='-D'
-                       pkg_delete -f $opt_del "$@"
+                       dev_out=/dev/stdout
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               dev_out=/dev/null
+                               dev_err=/dev/null
+                       fi
+                       pkg_delete -f $opt_del "$@" > $dev_out 2> $dev_err
                }
                pkg_add_f ()
                {
-                       local opt_add
+                       local opt_add dev_out dev_err
                        rm -rf "${TMPDIR}/pkg_add_f"
                        mkdir -p "${TMPDIR}/pkg_add_f"
                        ln -s "$@" "${TMPDIR}/pkg_add_f"
                        opt_add=
                        [ $no_exec_inst_script = yes ] && opt_add='-I'
-                       ( cd "${TMPDIR}/pkg_add_f" && pkg_add -if $opt_add * )
+                       dev_out=/dev/stdout
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               dev_out=/dev/null
+                               dev_err=/dev/null
+                       fi
+                       ( cd "${TMPDIR}/pkg_add_f" && pkg_add -if $opt_add * > $dev_out 2> $dev_err )
                }
                pkg_add_fF ()
                {
-                       local opt_add
+                       local opt_add dev_out dev_err
                        rm -rf "${TMPDIR}/pkg_add_f"
                        mkdir -p "${TMPDIR}/pkg_add_f"
                        ln -s "$@" "${TMPDIR}/pkg_add_f"
                        opt_add=
                        [ $no_exec_inst_script = yes ] && opt_add='-I'
-                       ( cd "${TMPDIR}/pkg_add_f" && pkg_add -ifF $opt_add * )
+                       dev_out=/dev/stdout
+                       dev_err=/dev/stderr
+                       if [ $opt_batch_mode = yes ]
+                       then
+                               dev_out=/dev/null
+                               dev_err=/dev/null
+                       fi
+                       ( cd "${TMPDIR}/pkg_add_f" && pkg_add -ifF $opt_add * > $dev_out 2> $dev_err )
                }
                pkg_inst_verify_pkg ()
                {
@@ -846,7 +922,7 @@ pkgsys_def_pkgtools ()
                }
                pkg_inst_remote ()
                {
-                       local pkg pkgarc opt_add
+                       local pkg pkgarc opt_add dev_out dev_err
                        pkg=$1
                        if pkg_inst_remote_verify_fetch "$pkg"
                        then
@@ -856,7 +932,14 @@ pkgsys_def_pkgtools ()
                                ln -s "$@" "${TMPDIR}/pkg_add_f"
                                opt_add=
                                [ $no_exec_inst_script = yes ] && opt_add='-I'
-                               ( cd "${TMPDIR}/pkg_inst_remote" && ls -s "$pkgarc" && pkg_add -ifF $opt_add * )
+                               dev_out=/dev/stdout
+                               dev_err=/dev/stderr
+                               if [ $opt_batch_mode = yes ]
+                               then
+                                       dev_out=/dev/null
+                                       dev_err=/dev/null
+                               fi
+                               ( cd "${TMPDIR}/pkg_inst_remote" && ls -s "$pkgarc" && pkg_add -ifF $opt_add * > $dev_out 2> $dev_err )
                        fi
                }
                pkg_inst_wild_verify_pkg ()

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index 408941b..18310d8 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -471,7 +471,6 @@ command_all_exec_before_tools_upgrade ()
 # ============= Execute command operations which must be done before the database construction =============
 command_all_exec_before_build_database ()
 {
-local dstfile
        case $COMMAND_MODE in
        do )
                command_do_do__command_all_exec_before_build_database