From cbed15058abe144cf3ad07f9f1a4ca57eca6b6a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:42:11 -0500 Subject: remove the old fedora-packager-setup bash script --- src/fedora-packager-setup.sh | 120 ------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 src/fedora-packager-setup.sh (limited to 'src') diff --git a/src/fedora-packager-setup.sh b/src/fedora-packager-setup.sh deleted file mode 100644 index cbb2868..0000000 --- a/src/fedora-packager-setup.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -set -e - -function check_wget() { - if [ ! -f /usr/bin/wget ]; then - echo "You must have wget installed to download the required CA certificates" - echo "Please run \"yum install wget\" as root, and re-run this script" - exit 1 - fi -} - -echo "Setting up Koji client..." - -if [ ! -f ~/.fedora.cert ]; then - echo "You need a client certificate from the Fedora Account System" - echo "Please download one from https://admin.fedoraproject.org/accounts/user/gencert" - echo "Save it to ~/.fedora.cert and re-run this script" - exit 1 -fi - -rm ~/.fedora-upload-ca.cert - -if [ ! -f ~/.fedora-upload-ca.cert ]; then - check_wget - /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-upload-ca.cert" -O ~/.fedora-upload-ca.cert -fi - -rm ~/.fedora-server-ca.cert - -if [ ! -f ~/.fedora-server-ca.cert ]; then - check_wget - /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-server-ca.cert" -O ~/.fedora-server-ca.cert -fi - -if [ ! -d ~/.koji ]; then - mkdir ~/.koji -fi - - -for arch in arm alpha ia64 sparc s390 parisc ;do -rm -f ~/.koji/$arch-config -cat > ~/.koji/$arch-config < ~/.plague-client.cfg < Preferences -> Advanced -Click "View Certificates" -On "Your Certificates" tab, click "Import" -Select ~/fedora-browser-cert.p12 -Type the export passphrase you chose earlier - -Once imported, you should see a certificate named "Fedora Project". -Your username should appear underneath this. - -You should now be able to click the "login" link at http://koji.fedoraproject.org/koji/ successfully. -EOF -- cgit From baa707e594b013ec592577fd29f61ef10eb57aa0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:45:56 -0500 Subject: fix bug where file file is unlinked when it doesnt exist --- src/fedora-packager-setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index d60ac16..6e3e46a 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -114,7 +114,8 @@ def main(): download_cert('https://admin.fedoraproject.org/accounts/fedora-server-ca.cert', server_ca_cert) if not os.path.islink(upload_ca_cert): print 'Linking: ~/.fedora-server-ca.cert to ~/.fedora-upload-ca.cert' - os.unlink(upload_ca_cert) + if os.path.exists(upload_ca_cert): + os.unlink(upload_ca_cert) os.symlink(server_ca_cert, upload_ca_cert) if not os.path.isdir(os.path.join(user_home, '.koji')): os.mkdir(os.path.join(user_home, '.koji')) -- cgit From 102256826607e43a917c15458955ef2a679778db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:49:31 -0500 Subject: replace existing config file if it exists --- src/fedora-packager-setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index 6e3e46a..e015ed3 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -124,7 +124,10 @@ def main(): if not os.path.isfile(config_file): write_arch_config(arch, config_file) else: - print "koji config for %s exists" % arch + print "koji config for %s exists. Replacing with new file." % arch + os.unlink(config_file) + write_arch_config(arch, config_file) + print 'Setting up Browser Certificates' generate_browser_cert() -- cgit From e46a5a994ca199259f7937691c96531c8b81bc96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:50:23 -0500 Subject: add hppa arch to configs --- src/fedora-packager-setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index e015ed3..a74d06b 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -119,7 +119,7 @@ def main(): os.symlink(server_ca_cert, upload_ca_cert) if not os.path.isdir(os.path.join(user_home, '.koji')): os.mkdir(os.path.join(user_home, '.koji')) - for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390']: + for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390', 'hppa']: config_file = '%s/.koji/%s-config' % (user_home, arch) if not os.path.isfile(config_file): write_arch_config(arch, config_file) -- cgit From 44bf9d2d868180f18f5a26221a8cb1bce4579769 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 22:00:21 -0500 Subject: add extra files to Makefile.am add fedora-getsvn --- src/fedora-getsvn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/fedora-getsvn (limited to 'src') diff --git a/src/fedora-getsvn b/src/fedora-getsvn new file mode 100644 index 0000000..72f08ab --- /dev/null +++ b/src/fedora-getsvn @@ -0,0 +1,22 @@ +#! /bin/sh + +if [ $# -ne 3 ]; +then + echo "Usage: $0 " + exit 1 +fi + +project=$1 +url=$2 +rev=$3 + +tmpdir=`mktemp -d` +curdir=`pwd` + +( + cd ${tmpdir} + LANG=C TZ=GMT svn export ${url} -r ${rev} ${project} + tar cjvf ${curdir}/${project}-svn${rev}.tar.bz2 ${project} +) + +rm -rf ${tmpdir} -- cgit