- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fixed gettext support in gensync
by Giovanni Scafora 02 Apr '07

02 Apr '07

Let's me know if it's correct now. Fixed gettext support to gensync after Andrew's email. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/gensync b/scripts/gensync index f99cf59..2250c23 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -20,35 +20,45 @@ # USA. # +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=gensync +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + myver='3.0.0' # functions usage() { - echo "gensync $myver" - echo "usage: $0 <root> <destfile> [package_directory]" + echo "$(gettext "gensync %s")" $myver + local msg=$0; shift + printf "$(gettext "usage: \$msg <root> <destfile> [package_directory]")" $* echo - echo "gensync will generate a sync database by reading all PKGBUILD files" - echo "from <root>. gensync builds the database in a temporary directory" - echo "and then compresses it to <destfile>." + echo "$(gettext "gensync will generate a sync database by reading all PKGBUILD files")" + echo "$(gettext "from <root>. gensync builds the database in a temporary directory")" + echo "$(gettext "and then compresses it to <destfile>.")" echo - echo "gensync will calculate md5sums of packages in the same directory as" - echo "<destfile>, unless an alternate [package_directory] is specified." + echo "$(gettext "gensync will calculate md5sums of packages in the same directory as")" + echo "$(gettext "<destfile>, unless an alternate [package_directory] is specified.")" echo - echo "note: The <destfile> name is important. It must be of the form" - echo " {treename}.db.tar.gz where {treename} is the name of the custom" - echo " package repository you configured in /etc/pacman.conf. The" - echo " generated database must reside in the same directory as your" - echo " custom packages (also configured in /etc/pacman.conf)" + echo "$(gettext "note: The <destfile> name is important. It must be of the form")" + echo "$(gettext " {treename}.db.tar.gz where {treename} is the name of the custom")" + echo "$(gettext " package repository you configured in /etc/pacman.conf. The")" + echo "$(gettext " generated database must reside in the same directory as your")" + echo "$(gettext " custom packages (also configured in /etc/pacman.conf)")" echo - echo "example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz" + echo "$(gettext "example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz")" echo echo exit 0 } error () { - echo "==> ERROR: $*" >&2 + local msg=$*; shift + printf "$(gettext "==> ERROR: \$msg")" $* >&2 } die () { @@ -83,7 +93,7 @@ fi if [ -r /etc/makepkg.conf ]; then source /etc/makepkg.conf else - echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + echo "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")" >&2 exit 1 # $E_CONFIG_ERROR # TODO: error codes fi @@ -102,9 +112,9 @@ if [ "$3" != "" ]; then pkgdir="$3" fi -[ ! -d "$rootdir" ] && die "invalid root dir: $rootdir" +[ ! -d "$rootdir" ] && die "$(gettext "invalid root dir: %s")" $rootdir -echo "gensync: building database entries, generating md5sums..." >&2 +echo "$(gettext "gensync: building database entries, generating md5sums...")" >&2 cd "$destdir" pkgs="" @@ -113,7 +123,7 @@ forcepkgs="" for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do unset pkgname pkgver pkgrel options - source $file || die "failed to parse parse $file" + source $file || die "$(gettext "failed to parse parse %s")" $file if [ "$pkgdir" != "" ]; then pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" else @@ -121,7 +131,7 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do fi if [ ! -f "$pkgfile" ]; then - error "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - skipping" + error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT else if check_force; then forcepkgs="$forcepkgs $pkgfile" @@ -131,7 +141,7 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do fi done -echo "creating repo DB..." +echo "$(gettext "creating repo DB...")" # we'll trim the output just a tad, as gensync may be used on large repos repo-add $destfile $pkgs --force $force_pkgs \ -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [PATCH] more removedeps calling before exit
by Roman Kyrylych 02 Apr '07

02 Apr '07

oops, I forgot to fill Subject in previous message. -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH]
by Roman Kyrylych 02 Apr '07

02 Apr '07

Here's quick patch to fix http://bugs.archlinux.org/task/6791 However maybe it would be better to have some do_exit(<errorcode>) function that will cleanup things before exit. diff -uprN pacman-lib.orig/scripts/makepkg pacman-lib/scripts/makepkg --- pacman-lib.orig/scripts/makepkg 2007-03-30 06:24:09.000000000 +0300 +++ pacman-lib/scripts/makepkg 2007-04-02 18:42:06.000000000 +0300 @@ -676,18 +676,21 @@ for netfile in ${source[@]}; do if [ -z "$FTPAGENT" ]; then error "FTPAGENT is not configured. Check the /etc/makepkg.conf file." msg "Aborting..." + removedeps exit 1 fi ftpclient=$(echo $FTPAGENT | awk {'print $1'}) if [ ! -x "$ftpclient" ]; then error "ftpclient $(basename $ftpclient) is not installed." msg "Aborting..." + removedeps exit 1 fi proto=$(echo "$netfile" | sed 's|://.*||') if [ "$proto" != "ftp" -a "$proto" != "http" -a "$proto" != "https" ]; then error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." + removedeps exit 1 fi msg2 "Downloading $file" @@ -698,6 +701,7 @@ for netfile in ${source[@]}; do error "Failure while downloading $file" msg "Aborting..." #rm "$file" + removedeps exit 1 fi if [ -n "$SRCDEST" ]; then @@ -729,10 +733,13 @@ else sha256) integrity_name="sha256sum" ;; sha384) integrity_name="sha384sum" ;; sha512) integrity_name="sha512sum" ;; - *) error "Invalid integrity algorithm '$integ' specified"; exit 1;; + *) error "Invalid integrity algorithm '$integ' specified"; + removedeps + exit 1;; esac if [ ! $(type -p $integrity_name) ]; then error "Cannot find the $integrity_name program." + removedeps exit 1 fi @@ -778,6 +785,7 @@ else done if [ $errors -gt 0 ]; then error "One or more files did not pass the validity check!" + removedeps exit 1 fi else @@ -831,6 +839,7 @@ else if [ "$unziphack" != "1" -o $? -ne 1 ]; then error "Failed to extract $file" msg "Aborting..." + removedeps exit 1 fi fi @@ -1060,6 +1069,7 @@ comp_files=".PKGINFO .FILELIST ${install if ! tar czf $pkg_file $comp_files *; then error "Failed to create package file." + removedeps exit 1 fi -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH] Fixed gettext support in abs
by Giovanni Scafora 02 Apr '07

02 Apr '07

Fixed gettext support to abs after Andrew's email Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/abs b/scripts/abs index 2ec4322..315ece3 100755 --- a/scripts/abs +++ b/scripts/abs @@ -1,5 +1,13 @@ #!/bin/bash +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=abs +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + CONFDIR="/etc/abs" CONNMODE="m" @@ -9,14 +17,15 @@ CONNMODE="m" [ -f ~/.abs.conf ] && source ~/.abs.conf usage() { - echo "Arch Build System -- synchronization utility" - echo "usage: $0 [-p] [repository1 [repository2 ...]]" + echo "$(gettext "Arch Build System -- synchronization utility")" + local msg=$0; shift + printf "$(gettext "usage: \$msg [-p] [repository1 [repository2 ...]]")" $* echo - echo "abs will synchronize PKGBUILD scripts from the CVS repository" - echo "into $ABSROOT. You can follow different package trees by" - echo "editing /etc/abs/supfile.* files. If no argument is given, abs " - echo "will synchronize from supfiles specified in /etc/abs/abs.conf." - echo "If -p is specified, the connection is opened in passive mode." + echo "$(gettext "abs will synchronize PKGBUILD scripts from the CVS repository")" + echo "$(gettext "into %s. You can follow different package trees by")" $ABSROOT + echo "$(gettext "editing /etc/abs/supfile.* files. If no argument is given, abs ")" + echo "$(gettext "will synchronize from supfiles specified in /etc/abs/abs.conf.")" + echo "$(gettext "If -p is specified, the connection is opened in passive mode.")" } update() { @@ -43,11 +52,11 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then fi if [ ! -d "$ABSROOT" ]; then - echo "abs: $ABSROOT does not exist (or is not a directory)" + echo "$(gettext "abs: %s does not exist (or is not a directory)")" $ABSROOT exit 1 fi if [ ! -w "$ABSROOT" ]; then - echo "abs: no write permissions in $ABSROOT" + echo "$(gettext "abs: no write permissions in %s")" $ABSROOT exit 1 fi @@ -56,7 +65,7 @@ if [ "$(type -p cvsup)" ]; then elif [ "$(type -p csup)" ]; then CVSUP="csup" else - echo "abs: missing CVS synchronization utility. Install cvsup or csup." + echo "$(gettext "abs: missing CVS synchronization utility. Install cvsup or csup.")" exit 1 fi -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [PATCH] Gettext support in gensync
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to gensync. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/gensync b/scripts/gensync index f99cf59..fa88f32 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -20,28 +20,37 @@ # USA. # +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=gensync +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + myver='3.0.0' # functions usage() { - echo "gensync $myver" - echo "usage: $0 <root> <destfile> [package_directory]" + echo "$(eval_gettext "gensync \$myver")" + gensync=$0 + echo "$(eval_gettext "usage: \$gensync <root> <destfile> [package_directory]")" echo - echo "gensync will generate a sync database by reading all PKGBUILD files" - echo "from <root>. gensync builds the database in a temporary directory" - echo "and then compresses it to <destfile>." + echo "$(gettext "gensync will generate a sync database by reading all PKGBUILD files")" + echo "$(gettext "from <root>. gensync builds the database in a temporary directory")" + echo "$(gettext "and then compresses it to <destfile>.")" echo - echo "gensync will calculate md5sums of packages in the same directory as" - echo "<destfile>, unless an alternate [package_directory] is specified." + echo "$(gettext "gensync will calculate md5sums of packages in the same directory as")" + echo "$(gettext "<destfile>, unless an alternate [package_directory] is specified.")" echo - echo "note: The <destfile> name is important. It must be of the form" - echo " {treename}.db.tar.gz where {treename} is the name of the custom" - echo " package repository you configured in /etc/pacman.conf. The" - echo " generated database must reside in the same directory as your" - echo " custom packages (also configured in /etc/pacman.conf)" + echo "$(gettext "note: The <destfile> name is important. It must be of the form")" + echo "$(gettext " {treename}.db.tar.gz where {treename} is the name of the custom")" + echo "$(gettext " package repository you configured in /etc/pacman.conf. The")" + echo "$(gettext " generated database must reside in the same directory as your")" + echo "$(gettext " custom packages (also configured in /etc/pacman.conf)")" echo - echo "example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz" + echo "$(gettext "example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz")" echo echo exit 0 @@ -83,7 +92,7 @@ fi if [ -r /etc/makepkg.conf ]; then source /etc/makepkg.conf else - echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + echo "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")" >&2 exit 1 # $E_CONFIG_ERROR # TODO: error codes fi @@ -102,9 +111,9 @@ if [ "$3" != "" ]; then pkgdir="$3" fi -[ ! -d "$rootdir" ] && die "invalid root dir: $rootdir" +[ ! -d "$rootdir" ] && die "$(eval_gettext "invalid root dir: \$rootdir")" -echo "gensync: building database entries, generating md5sums..." >&2 +echo "$(gettext "gensync: building database entries, generating md5sums...")" >&2 cd "$destdir" pkgs="" @@ -113,7 +122,7 @@ forcepkgs="" for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do unset pkgname pkgver pkgrel options - source $file || die "failed to parse parse $file" + source $file || die "$(eval_gettext "failed to parse parse \$file")" if [ "$pkgdir" != "" ]; then pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" else @@ -121,7 +130,7 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do fi if [ ! -f "$pkgfile" ]; then - error "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - skipping" + error "$(eval_gettext "could not find \$pkgname-\$pkgver-\$pkgrel-\$CARCH.\$PKGEXT - skipping")" else if check_force; then forcepkgs="$forcepkgs $pkgfile" @@ -131,7 +140,7 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do fi done -echo "creating repo DB..." +echo "$(gettext "creating repo DB...")" # we'll trim the output just a tad, as gensync may be used on large repos repo-add $destfile $pkgs --force $force_pkgs \ -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

3 3

[pacman-dev] [PATCH] Gettext support in makeworld
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to makeworld. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/makeworld b/scripts/makeworld index b9d318c..b387c8a 100755 --- a/scripts/makeworld +++ b/scripts/makeworld @@ -20,37 +20,46 @@ # USA. # +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=makeworld +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + version="3.0.0" toplevel=$(pwd) usage() { - echo "makeworld version $version" - echo "usage: $0 [options] <destdir> <category> [category] ..." - echo "options:" - echo " -b, --builddeps Build missing dependencies from source" - echo " -B, --noccache Do not use ccache during build" - echo " -c, --clean Clean up work files after build" - echo " -C, --cleancache Clean up source files from the cache" - echo " -d, --nodeps Skip all dependency checks" - echo " -e, --noextract Do not extract source files (use existing src/ dir)" - echo " -f, --force Overwrite existing packages" - echo " -i, --install Install package after successful build" - echo " -m, --nocolor Disable colorized output messages" - echo " -h, --help This help" - echo " -o, --nobuild Download and extract files only" - echo " -r, --rmdeps Remove installed dependencies after a successful build" - echo " -s, --syncdeps Install missing dependencies with pacman" - echo " -S, --usesudo Use sudo when running pacman commands" + echo "$(eval_gettext "makeworld version \$version")" + makeworld=$0 + echo "$(eval_gettext "usage: \$makeworld [options] <destdir> <category> [category] ...")" + echo "$(gettext "options:")" + echo "$(gettext " -b, --builddeps Build missing dependencies from source")" + echo "$(gettext " -B, --noccache Do not use ccache during build")" + echo "$(gettext " -c, --clean Clean up work files after build")" + echo "$(gettext " -C, --cleancache Clean up source files from the cache")" + echo "$(gettext " -d, --nodeps Skip all dependency checks")" + echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" + echo "$(gettext " -f, --force Overwrite existing packages")" + echo "$(gettext " -i, --install Install package after successful build")" + echo "$(gettext " -m, --nocolor Disable colorized output messages")" + echo "$(gettext " -h, --help This help")" + echo "$(gettext " -o, --nobuild Download and extract files only")" + echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" + echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" + echo "$(gettext " -S, --usesudo Use sudo when running pacman commands")" echo - echo "These options can be passed to pacman:" + echo "$(gettext "These options can be passed to pacman:")" echo - echo " --noconfirm Do not ask for confirmation when resolving dependencies" - echo " --noprogressbar Do not show a progress bar when downloading files" + echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" echo - echo "Where <category> is one or more directory names under the ABS root" - echo "eg: makeworld -c /packages base lib editors" + echo "$(gettext "Where <category> is one or more directory names under the ABS root")" + echo "$(gettext "eg: makeworld -c /packages base lib editors")" echo - echo "This should be run from the toplevel directory of ABS (usually /var/abs)" + echo "$(gettext "This should be run from the toplevel directory of ABS (usually /var/abs)")" } if [ $# -lt 2 ]; then @@ -154,18 +163,18 @@ for category in $*; do d=$(date +"[%b %d %H:%M]") echo -n "$d " >>$toplevel/build.log case $buildstatus in - 0) echo "$pkgname already built -- skipping" >>$toplevel/build.log ;; - 1) echo "$pkgname was built successfully" >>$toplevel/build.log ;; - 2) echo "$pkgname build failed" >>$toplevel/build.log ;; + 0) echo "$(eval_gettext "\$pkgname already built -- skipping")" >>$toplevel/build.log ;; + 1) echo "$(eval_gettext "\$pkgname was built successfully")" >>$toplevel/build.log ;; + 2) echo "$(eval_gettext "\$pkgname build failed")" >>$toplevel/build.log ;; esac fi done done ed=$(date +"[%b %d %H:%M]") -echo "makeworld complete." >>$toplevel/build.log -echo " started: $sd" >>$toplevel/build.log -echo " finished: $ed" >>$toplevel/build.log +echo "$(gettext "makeworld complete.")" >>$toplevel/build.log +echo "$(eval_gettext " started: \$sd")" >>$toplevel/build.log +echo "$(eval_gettext " finished: \$ed")" >>$toplevel/build.log exit 0 -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] pacman PKGBUILD needs depends=(python)
by Andrew Fyfe 02 Apr '07

02 Apr '07

Just installed arch to do some testing, went to run rankmirros as pacman suggests and no python, ooops. Python needs added to the depends list for pacman3. Andrew

7 9

[pacman-dev] [PATCH] Gettext support in abs
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to abs Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/abs b/scripts/abs index 2ec4322..af01cd5 100755 --- a/scripts/abs +++ b/scripts/abs @@ -1,5 +1,13 @@ #!/bin/bash +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=abs +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + CONFDIR="/etc/abs" CONNMODE="m" @@ -9,14 +17,15 @@ CONNMODE="m" [ -f ~/.abs.conf ] && source ~/.abs.conf usage() { - echo "Arch Build System -- synchronization utility" - echo "usage: $0 [-p] [repository1 [repository2 ...]]" + echo "$(gettext "Arch Build System -- synchronization utility")" + abs=$0 + echo "$(eval_gettext "usage: \$abs [-p] [repository1 [repository2 ...]]")" echo - echo "abs will synchronize PKGBUILD scripts from the CVS repository" - echo "into $ABSROOT. You can follow different package trees by" - echo "editing /etc/abs/supfile.* files. If no argument is given, abs " - echo "will synchronize from supfiles specified in /etc/abs/abs.conf." - echo "If -p is specified, the connection is opened in passive mode." + echo "$(gettext "abs will synchronize PKGBUILD scripts from the CVS repository")" + echo "$(eval_gettext "into \$ABSROOT. You can follow different package trees by")" + echo "$(gettext "editing /etc/abs/supfile.* files. If no argument is given, abs ")" + echo "$(gettext "will synchronize from supfiles specified in /etc/abs/abs.conf.")" + echo "$(gettext "If -p is specified, the connection is opened in passive mode.")" } update() { @@ -43,11 +52,11 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then fi if [ ! -d "$ABSROOT" ]; then - echo "abs: $ABSROOT does not exist (or is not a directory)" + echo "$(eval_gettext "abs: \$ABSROOT does not exist (or is not a directory)")" exit 1 fi if [ ! -w "$ABSROOT" ]; then - echo "abs: no write permissions in $ABSROOT" + echo "$(eval_gettext "abs: no write permissions in \$ABSROOT")" exit 1 fi @@ -56,7 +65,7 @@ if [ "$(type -p cvsup)" ]; then elif [ "$(type -p csup)" ]; then CVSUP="csup" else - echo "abs: missing CVS synchronization utility. Install cvsup or csup." + echo "$(gettext "abs: missing CVS synchronization utility. Install cvsup or csup.")" exit 1 fi -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [patch] Cleanup makepkg.conf options and loading of makepkg.conf.
by Andrew Fyfe 02 Apr '07

02 Apr '07

Moved the following vars in /etc/makepkg.conf * BUILDSCRIPT * PKGEXT * DB_COMPRESSION * DB_CHECKSUMS Cleaned up sourcing of /etc/makepkg.conf in scripts and source ~/.makepkg.conf if it exists. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 12 ++++++++++++ scripts/gensync | 11 +++++++---- scripts/makepkg | 23 +++++++++++------------ scripts/repo-add | 11 ++++++++--- scripts/repo-remove | 11 ++++++++--- scripts/updatesync | 11 +++++++---- 6 files changed, 53 insertions(+), 26 deletions(-) Andrew >From f8dde814bd2137659dfca730d2c5a53dc612acd9 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 12:41:47 +0100 Subject: [PATCH 2/2] Cleanup makepkg.conf options and loading of makepkg.conf. Moved the following vars in /etc/makepkg.conf * BUILDSCRIPT * PKGEXT * DB_COMPRESSION * DB_CHECKSUMS Cleaned up sourcing of /etc/makepkg.conf in scripts and source ~/.makepkg.conf if it exists. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 12 ++++++++++++ scripts/gensync | 11 +++++++---- scripts/makepkg | 23 +++++++++++------------ scripts/repo-add | 11 ++++++++--- scripts/repo-remove | 11 ++++++++--- scripts/updatesync | 11 +++++++---- 6 files changed, 53 insertions(+), 26 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ac0ef2..6f9e977 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -75,4 +75,16 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc}) #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>" +######################################################################### +# BUILDSCRIPT/EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +BUILDSCRIPT="PKGBUILD" +PKGEXT=".pkg.tar.gz" +DB_COMPRESSION="gz" +DB_CHECKSUMS=(md5) + # vim: set ft=sh ts=2 sw=2 et: diff --git a/scripts/gensync b/scripts/gensync index 5a3dab8..7ebf3f0 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -45,10 +45,13 @@ usage() { exit 0 } -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source /etc/makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf error () { echo "==> ERROR: $*" >&2 diff --git a/scripts/makepkg b/scripts/makepkg index 92d8ab2..0739204 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -28,11 +28,12 @@ myver='3.0.0' startdir=$(pwd) -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source "/etc/abs/abs.conf" -SRCROOT="$ABSROOT" +# Only use ABSROOT if we haven't been passed a SRCROOT on the command line. +if [ -z "$SRCROOT" ]; then + [ -r "/etc/abs/abs.conf" ] && source /etc/abs/abs.conf + [ -r "~/.abs.conf" ] && source ~/.abs.conf + SRCROOT="$ABSROOT" +fi # Options CLEANUP=0 @@ -409,18 +410,16 @@ ARGLIST=$@ _PKGDEST=${PKGDEST} _SRCDEST=${SRCDEST} -#Source makepkg.conf; fail if it is not found -if [ -f /etc/makepkg.conf ]; then +# Source makepkg.conf; fail if it is not found +if [ -r /etc/makepkg.conf ]; then source /etc/makepkg.conf else error "/etc/makepkg.conf not found. cannot continue" - exit 1 + exit 1 # $E_CONFIG_ERROR # TODO: error codes fi -#Source user-specific makepkg.conf overrides -if [ -f ~/.makepkg.conf ]; then - source ~/.makepkg.conf -fi +# Source user-specific makepkg.conf overrides +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} diff --git a/scripts/repo-add b/scripts/repo-add index d6e2c5a..213d068 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -23,11 +23,16 @@ myver='3.0.0' FORCE=0 REPO_DB_FILE="" - -DB_COMPRESSION="gz" #TODO this is gross -DB_CHECKSUMS=(md5) TMP_DIR="" +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + # print usage instructions usage() { echo "repo-add $myver" diff --git a/scripts/repo-remove b/scripts/repo-remove index eeee240..0e8e46d 100755 --- a/scripts/repo-remove +++ b/scripts/repo-remove @@ -23,11 +23,16 @@ myver='3.0.0' FORCE=0 REPO_DB_FILE="" - -DB_COMPRESSION="gz" #TODO this is gross -DB_CHECKSUMS=(md5) TMP_DIR="" +if [ -r /etc/makepkg.conf ]; then + source /etc/makpkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error code +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + # print usage instructions usage() { echo "repo-remove $myver" diff --git a/scripts/updatesync b/scripts/updatesync index a4a6847..09c8ca0 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -47,10 +47,13 @@ usage() { exit 0 } -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source /etc/makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf error () { echo "==> ERROR: $*" >&2 -- 1.5.0.6

2 3

[pacman-dev] FS#4404 - rsync protocol support for makepkg.
by Andrew Fyfe 01 Apr '07

01 Apr '07

Rediffed post gettext changes. Andrew

1 3