From e6ae7bcfbd2e2575190580a63fa5b39188a1efc8 Mon Sep 17 00:00:00 2001 From: simo Date: Sun, 24 Apr 2005 05:30:11 +0000 Subject: Added communitypkg Added config file support to tupkg --- tupkg/client/communitypkg | 85 +++++++++++++++++++++++++++++++++++++++++++++++ tupkg/client/tupkg | 33 +++++++++++++----- 2 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 tupkg/client/communitypkg (limited to 'tupkg/client') diff --git a/tupkg/client/communitypkg b/tupkg/client/communitypkg new file mode 100644 index 0000000..5073dcc --- /dev/null +++ b/tupkg/client/communitypkg @@ -0,0 +1,85 @@ +#!/bin/bash + +source /etc/makepkg.conf + +#cmd=`basename $0` + +#if echo *.pkg.tar.gz | grep ' ' >/dev/null 2>&1; then +# echo "Too many packages in current dir" +# exit 1 +#fi +# +#if [ ! -f *.pkg.tar.gz ]; then +# echo "No package file" +# exit 1 +#fi +# +#pkgfile=`echo *.pkg.tar.gz` +#pkg=`echo *.pkg.tar.gz | rev | cut -d- -f 3- | rev` +#ver=`echo *.pkg.tar.gz | rev | cut -d- -f -2 | rev | sed 's/\.pkg\.tar\.gz//'` + +if [ ! -f PKGBUILD ]; then + echo "No PKGBUILD file" + exit 1 +fi + +source PKGBUILD +pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz + +if [ ! -f $pkgfile ]; then + echo "File $pkgfile doesn't exist" + exit 1 +fi + +repo="community" +tag="CURRENT" +#if [ "$cmd" == "extrapkg" ]; then +# repo="extra" +# tag="CURRENT" +#elif [ "$cmd" == "currentpkg" ]; then +# repo="current" +# tag="CURRENT" +#elif [ "$cmd" == "testingpkg" ]; then +# repo="testing" +# tag="TESTING" +#elif [ "$cmd" == "unstablepkg" ]; then +# repo="unstable" +# tag="CURRENT" +#fi + +#scp $pkgfile archlinux.org:/home/ftp/$repo/os/$CARCH +if [ ! -f ~/.tupkg ]; then + echo "Must configure tupkg via ~/.tupkg, cancelled" + exit 1 +fi +tupkg $pkgfile +if [ $? -ne 0 ]; then + echo "Cancelled" + exit 1 +fi +echo "===> Uploaded $pkgfile" + +if [ "$1" != "" ]; then +cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel +$1" > /dev/null +if [ $? -ne 0 ]; then + echo "Cancelled" + exit 1 +fi +echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel +$1\" message" +else +cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null +if [ $? -ne 0 ]; then + echo "Cancelled" + exit 1 +fi +echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message" +fi + +cvs tag -c -F -R $tag > /dev/null +if [ $? -ne 0 ]; then + echo "Cancelled" + exit 1 +fi +echo "===> Tagged as $tag" diff --git a/tupkg/client/tupkg b/tupkg/client/tupkg index 458d86b..c4806c9 100755 --- a/tupkg/client/tupkg +++ b/tupkg/client/tupkg @@ -21,6 +21,7 @@ import cgi import urllib import md5 import getopt +import ConfigParser class ClientFile: def __init__(self, pathname): @@ -118,20 +119,36 @@ def usage(): print " -P, --password Connect with password" print " -h, --host Connect to host" print " -p, --port Connect to host on port (default 1034)" + print "May also use conf file: ~/.tupkg" def main(argv=None): if argv is None: argv = sys.argv confdict = {} - confdict['user'] = "" - confdict['password'] = "" - confdict['host'] = 'aur.archlinux.org' - confdict['port'] = 1034 - - if len(argv) == 1: - usage() - return 1 + conffile = os.path.join(os.getenv("HOME"),".tupkg") #try the standard location + #Set variables from file now, may be overridden on command line + if os.path.isfile(conffile): + config = ConfigParser.ConfigParser() + config.read(conffile) + confdict['user'] = config.get('tupkg','username') + confdict['password'] = config.get('tupkg','password') + try: + confdict['host'] = config.get('tupkg','host') + except: + confdict['host'] = 'aur.archlinux.org' + try: + confdict['port'] = config.get('tupkg','port') + except: + confdict['port'] = 1034 + else: + confdict['user'] = "" + confdict['password'] = "" + confdict['host'] = 'aur.archlinux.org' + confdict['port'] = 1034 + if len(argv) == 1: #no config file and no args, bail + usage() + return 1 try: optlist, args = getopt.getopt(argv[1:], "u:P:h:p:", ["user=", "password=", "host=", "port="]) -- cgit v1.2.3-70-g09d2