FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 07-15-2012, 05:54 AM
Allan McRae
 
Default makepkg: renamve myver

myver is a bit generic for an internal variable name.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/makepkg.sh.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 9baf350..93587b3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -39,7 +39,7 @@ export COMMAND_MODE='legacy'
# Ensure CDPATH doesn't screw with our cd calls
unset CDPATH

-declare -r myver='@PACKAGE_VERSION@'
+declare -r makepkg_version='@PACKAGE_VERSION@'
declare -r confdir='@sysconfdir@'
declare -r BUILDSCRIPT='@BUILDSCRIPT@'
declare -r startdir="$PWD"
@@ -1498,7 +1498,7 @@ write_pkginfo() {
size="$(( ${size%%[^0-9]*} * 1024 ))"

msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
- echo "# Generated by makepkg $myver"
+ echo "# Generated by makepkg $makepkg_version"
if (( INFAKEROOT )); then
echo "# using $(fakeroot -v)"
fi
@@ -2076,7 +2076,7 @@ canonicalize_path() {
m4_include(library/parseopts.sh)

usage() {
- printf "makepkg (pacman) %s
" "$myver"
+ printf "makepkg (pacman) %s
" "$makepkg_version"
echo
printf -- "$(gettext "Usage: %s [options]")
" "$0"
echo
@@ -2121,7 +2121,7 @@ usage() {
}

version() {
- printf "makepkg (pacman) %s
" "$myver"
+ printf "makepkg (pacman) %s
" "$makepkg_version"
printf -- "$(gettext "
Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.

Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.


--
1.7.11.2
 

Thread Tools




All times are GMT. The time now is 07:44 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org