- Pacman-dev - lists.archlinux.org

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

02 Apr '07

Add gettext support to repo-remove. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/repo-remove b/scripts/repo-remove index 37079d9..4f237f6 100755 --- a/scripts/repo-remove +++ b/scripts/repo-remove @@ -19,6 +19,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=repo-remove +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + myver='3.0.0' FORCE=0 @@ -27,16 +35,16 @@ TMP_DIR="" # print usage instructions usage() { - echo "repo-remove $myver" + echo "$(gettext "repo-remove %s")" $myver echo - echo "usage: repo-remove <path-to-db> <packagename> ..." + echo "$(gettext "usage: repo-remove <path-to-db> <packagename> ...")" echo - echo "repo-remove will update a package database by removing the package name" - echo "specified on the command line from the given repo database. Multiple" - echo "packages to remove can be specified on the command line." + echo "$(gettext "repo-remove will update a package database by removing the package name")" + echo "$(gettext "specified on the command line from the given repo database. Multiple")" + echo "$(gettext "packages to remove can be specified on the command line.")" echo - echo "Example:" - echo " repo-remove /path/to/repo.db.tar.gz kernel26" + echo "$(gettext "Example:")" + echo "$(gettext " repo-remove /path/to/repo.db.tar.gz kernel26")" echo } @@ -57,7 +65,7 @@ db_remove_entry() # remove any other package in the DB with same name for existing in *; do if [ "${existing%-*-*}" = "$1" ]; then - echo ":: removing existing package '$existing'" + echo "$(gettext ":: removing existing package '%s'")" $existing rm -rf $existing fi done @@ -81,7 +89,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 @@ -92,7 +100,7 @@ fi # main routine if [ $# -gt 1 ]; then gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - echo "cannot create temp directory for database building"; \ + echo "$(gettext "cannot create temp directory for database building")"; \ exit 1) success=0 @@ -101,20 +109,20 @@ if [ $# -gt 1 ]; then if [ -z "$REPO_DB_FILE" ]; then REPO_DB_FILE="$(readlink -f $arg)" if ! test_repo_db_file; then - echo "error: repository file '$REPO_DB_FILE' is not a proper pacman db" + echo "$(gettext "error: repository file '%s' is not a proper pacman db")" $REPO_DB_FILE exit 1 elif [ -f "$REPO_DB_FILE" ]; then - echo ":: extracting database to a temporary location" + echo "$(gettext ":: extracting database to a temporary location")" tar xf "$REPO_DB_FILE" -C "$gstmpdir" fi else - echo ":: searching for package '$arg'" + echo "$(gettext ":: searching for package '%s'")" this_dir="$(pwd)" if db_remove_entry "$arg"; then success=1 else - echo "error: package matching '$arg' not found" + echo "$(gettext "error: package matching '%s' not found")" $arg fi cd $this_dir fi @@ -122,7 +130,7 @@ if [ $# -gt 1 ]; then # if all operations were a success, rezip database if [ "$success" = "1" ]; then - echo ":: creating updated database file ${REPO_DB_FILE}" + echo "$(gettext ":: creating updated database file %s")" ${REPO_DB_FILE} cd $gstmpdir if [ -n "$(ls)" ]; then [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" @@ -130,12 +138,12 @@ if [ $# -gt 1 ]; then case "$DB_COMPRESSION" in gz) tar c * | gzip -9 >$REPO_DB_FILE ;; bz2) tar c * | bzip2 -9 >$REPO_DB_FILE ;; - *) echo "warning: no compression set" + *) echo "$(gettext "warning: no compression set")" tar c * >$REPO_DB_FILE;; esac fi else - echo ":: no packages modified, nothing to do" + echo "$(gettext ":: no packages modified, nothing to do")" fi 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 repo-add
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to repo-add. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/repo-add b/scripts/repo-add index 8b81c34..200f875 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -19,6 +19,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=repo-add +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + myver='3.0.0' FORCE=0 @@ -27,19 +35,19 @@ TMP_DIR="" # print usage instructions usage() { - echo "repo-add $myver" + echo "$(gettext "repo-add %s")" $myver echo - echo "usage: repo-add <path-to-db> [--force] <package> ..." + echo "$(gettext "usage: repo-add <path-to-db> [--force] <package> ...")" echo - echo "repo-add will update a package database by reading a package file." - echo "Multiple packages to add can be specified on the command line." + echo "$(gettext "repo-add will update a package database by reading a package file.")" + echo "$(gettext "Multiple packages to add can be specified on the command line.")" echo - echo "The --force flag will add a 'force' entry to the sync database, which" - echo "tells pacman to skip its internal version number checking and update" - echo "the package regardless." + echo "$(gettext "The --force flag will add a 'force' entry to the sync database, which")" + echo "$(gettext "tells pacman to skip its internal version number checking and update")" + echo "$(gettext "the package regardless.")" echo - echo "Example:" - echo " repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz" + echo "$(gettext "Example:")" + echo "$(gettext " repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")" echo } @@ -127,14 +135,14 @@ db_write_entry() # ensure $pkgname and $pkgver variables were found if [ -z "$pkgname" -o -z "$pkgver" ]; then - echo " error: invalid package file" + echo "$(gettext " error: invalid package file")" return 1 fi # remove any other package in the DB with same name for existing in *; do if [ "${existing%-*-*}" = "$pkgname" ]; then - echo ":: removing existing package '$existing'" + echo "$(gettext ":: removing existing package '%s'")" $existing rm -rf $existing fi done @@ -144,7 +152,7 @@ db_write_entry() cd "$pkgname-$pkgver" # create desc entry - echo ":: creating 'desc' db entry" + echo "$(gettext ":: creating 'desc' db entry")" echo -e "%FILENAME%\n$(basename $1)\n" >> desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc @@ -162,7 +170,7 @@ db_write_entry() # compute checksums for chk in ${DB_CHECKSUMS[@]}; do name="$(checksum_name $chk)" - echo ":: computing $name checksums" + echo "$(gettext ":: computing %s checksums")" $name if [ -n "$name" ]; then echo -e "%$name%\n$(get_checksum $chk $pkgfile)\n" >>desc fi @@ -225,7 +233,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 @@ -236,7 +244,7 @@ fi # main routine if [ $# -gt 1 ]; then gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - echo "cannot create temp directory for database building"; \ + echo "$(gettext "cannot create temp directory for database building")"; \ exit 1) success=0 @@ -247,18 +255,18 @@ if [ $# -gt 1 ]; then elif [ -z "$REPO_DB_FILE" ]; then REPO_DB_FILE="$(readlink -f $arg)" if ! test_repo_db_file; then - echo "error: repository file '$REPO_DB_FILE' is not a proper pacman db" + echo "$(gettext "error: repository file '%s' is not a proper pacman db")" $REPO_DB_FILE exit 1 elif [ -f "$REPO_DB_FILE" ]; then - echo ":: extracting database to a temporary location" + echo "$(gettext ":: extracting database to a temporary location")" tar xf "$REPO_DB_FILE" -C "$gstmpdir" fi else if [ -f "$arg" ]; then if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then - echo "error: '$arg' is not a package file, skipping" + echo "$(gettext "error: '%s' is not a package file, skipping")" $arg else - echo ":: adding package '$arg'" + echo "$(gettext ":: adding package '%s'")" $arg this_dir="$(pwd)" if db_write_entry "$arg"; then @@ -267,14 +275,14 @@ if [ $# -gt 1 ]; then cd $this_dir fi else - echo "error: package '$arg' not found" + echo "$(gettext "error: package '%s' not found")" $arg fi fi done # if all operations were a success, rezip database if [ "$success" = "1" ]; then - echo ":: creating updated database file ${REPO_DB_FILE}" + echo "$(gettext ":: creating updated database file %s")" ${REPO_DB_FILE} cd $gstmpdir if [ -n "$(ls)" ]; then [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" @@ -282,12 +290,12 @@ if [ $# -gt 1 ]; then case "$DB_COMPRESSION" in gz) tar c * | gzip -9 >$REPO_DB_FILE ;; bz2) tar c * | bzip2 -9 >$REPO_DB_FILE ;; - *) echo "warning: no compression set" + *) echo "$(gettext "warning: no compression set")" tar c * >$REPO_DB_FILE;; esac fi else - echo ":: no packages modified, nothing to do" + echo "$(gettext ":: no packages modified, nothing to do")" fi 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 pacman-optimize
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to pacman-optimize. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/pacman-optimize b/scripts/pacman-optimize index ca17033..5b5a836 100755 --- a/scripts/pacman-optimize +++ b/scripts/pacman-optimize @@ -20,6 +20,14 @@ # USA. # +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=pacman-optimize +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + myver='3.0.0' error() { @@ -34,18 +42,19 @@ source /etc/rc.conf #for USECOLOR source /etc/rc.d/functions usage() { - echo "pacman-optimize $myver" - echo "usage: $0 [pacman_db_root]" + echo "$(gettext "pacman-optimize %s")" $myver + local msg=$0; shift + printf "$(gettext "usage: \$msg [pacman_db_root]")" $* echo - echo "pacman-optimize is a little hack that should improve the performance" - echo "of pacman when reading/writing to its filesystem-based database." + echo "$(gettext "pacman-optimize is a little hack that should improve the performance")" + echo "$(gettext "of pacman when reading/writing to its filesystem-based database.")" echo - echo "Because pacman uses many small files to keep track of packages," - echo "there is a tendency for these files to become fragmented over time." - echo "This script attempts to relocate these small files into one" - echo "continuous location on your hard drive. The result is that the hard" - echo "drive should be able to read them faster, since the hard drive head" - echo "does not have to move around the disk as much." + echo "$(gettext "Because pacman uses many small files to keep track of packages,")" + echo "$(gettext "there is a tendency for these files to become fragmented over time.")" + echo "$(gettext "This script attempts to relocate these small files into one")" + echo "$(gettext "continuous location on your hard drive. The result is that the hard")" + echo "$(gettext "drive should be able to read them faster, since the hard drive head")" + echo "$(gettext "does not have to move around the disk as much.")" echo } @@ -71,64 +80,64 @@ fi # make sure pacman isn't running if [ -f /tmp/pacman.lck ]; then - die "Pacman lockfile was found. Cannot run while pacman is running." + die "$(gettext "Pacman lockfile was found. Cannot run while pacman is running.")" fi if [ ! -d "$dbroot" ]; then - die "$dbroot does not exist or is not a directory" + die "$(gettext "%s does not exist or is not a directory")" $dbroot fi if [ ! -w "$dbroot" ]; then - die "You must have correct permissions to optimize the database" + die "$(gettext "You must have correct permissions to optimize the database")" fi # do not let pacman run while we do this touch /tmp/pacman.lck # step 1: sum the old db -stat_busy "Md5sum'ing the old database" +stat_busy "$(gettext "Md5sum'ing the old database")" find $dbroot -type f | sort | xargs md5sum > /tmp/pacsums.old stat_done # step 2: tar it up -stat_busy "Tar'ing up $dbroot" +stat_busy "$(gettext "Tar'ing up %s")" $dbroot cd $dbroot tar -czf /tmp/pacmanDB.tgz ./ if [ $? -ne 0 ]; then stat_fail rm -f /tmp/pacmanDB.tgz /tmp/pacsums.old - die_r "tar'ing up $dbroot failed" + die_r "$(gettext "tar'ing up %s failed")" $dbroot fi stat_done # step 3: make and sum the new db -stat_busy "Making and md5sum'ing the new db" +stat_busy "$(gettext "Making and md5sum'ing the new db")" mkdir $dbroot.new tar -zxpf /tmp/pacmanDB.tgz -C $dbroot.new/ if [ $? -ne 0 ]; then rm -f /tmp/pacmanDB.tgz /tmp/pacsums.old rm -rf "$dbroot.new" - die_r "untar'ing $dbroot failed" + die_r "$(gettext "untar'ing %s failed")" $dbroot fi find "$dbroot.new" -type f | sort | sed -e 's/pacman.new/pacman/g' |\ xargs md5sum > /tmp/pacsums.new stat_done # step 4: compare the sums -stat_busy "Checking integrity" +stat_busy "$(gettext "Checking integrity")" diff /tmp/pacsums.old /tmp/pacsums.new >/dev/null 2>&1 if [ $? -ne 0 ]; then # failed stat_fail # leave /tmp/pacsums.old and .new for checking to see what doesn't match up rm -rf "$dbroot.new" /tmp/pacman.lck /tmp/pacmanDB.tgz - die_r "integrity check FAILED, reverting to old database" + die_r "$(gettext "integrity check FAILED, reverting to old database")" fi stat_done # step 5: remove the new temporary database and the old one # and use the .tgz to replace the old one -stat_busy "Putting the new database in place" +stat_busy "$(gettext "Putting the new database in place")" rm -rf "$dbroot.new" "$dbroot"/* tar -zxpf /tmp/pacmanDB.tgz -C "$dbroot"/ stat_done @@ -137,7 +146,7 @@ stat_done rm -f /tmp/pacman.lck /tmp/pacsums.old /tmp/pacsums.new /tmp/pacmanDB.tgz echo -echo "Finished. Your pacman database has been optimized." +echo "$(gettext "Finished. Your pacman database has been optimized.")" echo 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] [PATCH] Fixed gettext support in makeworld
by Giovanni Scafora 02 Apr '07

02 Apr '07

Let's me know if it's corrext. Fixed gettext support to makeworld after Andrew's email. Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/makeworld b/scripts/makeworld index b9d318c..3a8d136 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 "$(gettext "makeworld version %s")" $version + local msg=$0; shift + printf "$(gettext "usage: \$msg [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 "$(gettext "%s already built -- skipping")" $pkgname >>$toplevel/build.log ;; + 1) echo "$(gettext "%s was built successfully")" $pkgname >>$toplevel/build.log ;; + 2) echo "$(gettext "%s build failed")" $pkgname >>$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 "$(gettext " started: %s")" $sd >>$toplevel/build.log +echo "$(gettext " finished: %s")" $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] [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