moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

makepkg: rename myver

Browse Source 
myver is a bit generic for an internal variable name.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-07-15 15:46:29 +10:00
parent 2042b79bcc
commit b3e82ec59e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/makepkg.sh.in
View File

@ -39,7 +39,7 @@ export COMMAND_MODE='legacy'
# Ensure CDPATH doesn't screw with our cd calls # Ensure CDPATH doesn't screw with our cd calls
unset CDPATH unset CDPATH
declare -r myver='@PACKAGE_VERSION@' declare -r makepkg_version='@PACKAGE_VERSION@'
declare -r confdir='@sysconfdir@' declare -r confdir='@sysconfdir@'
declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r BUILDSCRIPT='@BUILDSCRIPT@'
declare -r startdir="$PWD" declare -r startdir="$PWD"
@ -1503,7 +1503,7 @@ write_pkginfo() {
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating %s file...")" ".PKGINFO" msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
echo "# Generated by makepkg $myver" echo "# Generated by makepkg $makepkg_version"
if (( INFAKEROOT )); then if (( INFAKEROOT )); then
echo "# using $(fakeroot -v)" echo "# using $(fakeroot -v)"
fi fi
@ -2081,7 +2081,7 @@ canonicalize_path() {
m4_include(library/parseopts.sh) m4_include(library/parseopts.sh)
usage() { usage() {
printf "makepkg (pacman) %s\n" "$myver" printf "makepkg (pacman) %s\n" "$makepkg_version"
echo echo
printf -- "$(gettext "Usage: %s [options]")\n" "$0" printf -- "$(gettext "Usage: %s [options]")\n" "$0"
echo echo
@ -2126,7 +2126,7 @@ usage() {
} }
version() { version() {
printf "makepkg (pacman) %s\n" "$myver" printf "makepkg (pacman) %s\n" "$makepkg_version"
printf -- "$(gettext "\ printf -- "$(gettext "\
Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.\n\ Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.\n\
Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\n\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\n\n\