diff options
| -rw-r--r-- | scripts/Makefile.am | 4 | ||||
| -rw-r--r-- | scripts/pacman-optimize.sh.in | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 492eb0ff..e34c3005 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -82,7 +82,9 @@ pacman-key: \ $(srcdir)/pacman-key.sh.in \ $(srcdir)/library/output_format.sh -pacman-optimize: $(srcdir)/pacman-optimize.sh.in +pacman-optimize: \ + $(srcdir)/pacman-optimize.sh.in \ + $(srcdir)/library/output_format.sh pkgdelta: \ $(srcdir)/pkgdelta.sh.in \ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index c9d42d27..0dc32bfc 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -29,15 +29,7 @@ myver='@PACKAGE_VERSION@' eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) dbroot="${DBPath:-@localstatedir@/lib/pacman/}" -msg() { - local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&2 -} - -error () { - local mesg=$1; shift - printf "==> ERROR: ${mesg}\n" "$@" >&2 -} +m4_include(library/output_format.sh) usage() { printf "pacman-optimize (pacman) %s\n\n" "$myver" @@ -122,7 +114,7 @@ fi touch "$lockfile" workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) || - die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2 + die_r "$(gettext "Can not create temp directory for database building.")\n" >&2 # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" |