diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-07-16 16:58:36 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-07-16 16:58:36 (EDT) |
| commit | c85012fed1c7610a4b31b4ea62a189cae449d521 (patch) | |
| tree | 12810b797a150f930266ea8a84f74b05fa1b0a9e | |
| parent | 7769daf7cfd035eb0d457967a866195fd535091c (diff) | |
include: Clean up output.
| -rw-r--r-- | lib/cmd/include.sh | 10 | ||||
| -rw-r--r-- | locale/en_US/pro_archman.sh | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/cmd/include.sh b/lib/cmd/include.sh index a6dd05c..e38aab8 100644 --- a/lib/cmd/include.sh +++ b/lib/cmd/include.sh @@ -18,6 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. use control +use locale +use output CMD_INCLUDE_CHANGES_FIELDS='Format Source Binary Version Architecture Platform Distribution Maintainer Changed-By Date Description Changes Files' @@ -76,7 +78,7 @@ cmd_include() mkdir -p "${pool_dist_db}" printf '%s\n' "${cmd_include_version}" \ >"${pool_dist_db}/version" - printf 'Including %s (%s) into %s:\n' "${cmd_include_source}" \ + info "$(get_msg 'cmd_include_including')" "${cmd_include_source}" \ "${cmd_include_version}" "${cmd_include_distribution}" while read -r size file; do if [ "x$(echo ${file})" = 'x' ]; then @@ -85,12 +87,6 @@ cmd_include() IFS='_' read -r pkg binver arch plat <<-EOF ${file%.opk} EOF - printf ' %s:\n' "${file}" - printf ' Package: %s\n' "${pkg}" - printf ' Version: %s\n' "${binver}" - printf ' Architecture: %s\n' "${arch}" - printf ' Platform: %s\n' "${plat}" - printf ' Size: %s\n' "${size}" printf '%s\n' "${pool_dir}/${file}" \ >>"${pool_dist_db}/files" cp -p "$(dirname "${changes}")/${file}" \ diff --git a/locale/en_US/pro_archman.sh b/locale/en_US/pro_archman.sh index bf4e831..e1869e6 100644 --- a/locale/en_US/pro_archman.sh +++ b/locale/en_US/pro_archman.sh @@ -25,6 +25,7 @@ msg_pro_archman_cmd_help_summary='print this help message' msg_pro_archman_cmd_help_usage='[<command>]' msg_pro_archman_cmd_include_summary='include packages described in changes files' msg_pro_archman_cmd_include_usage='<changes> ...' +msg_pro_archman_cmd_include_including='Including %s (%s) into %s...' # lib/control.sh msg_pro_archman_control_empty_line='empty line' |