From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8FFA7138A1A for ; Mon, 5 Jan 2015 23:12:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77625E0857; Mon, 5 Jan 2015 23:12:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5911E0845 for ; Mon, 5 Jan 2015 23:12:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D341C3406DF for ; Mon, 5 Jan 2015 23:12:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1022EEF44 for ; Mon, 5 Jan 2015 23:12:37 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1420496493.c4e60a2dc6995a2b0be701769204d11fe7d1db0f.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/etc/, gkeys-ldap/bin/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys-ldap/bin/update-seeds.sh gkeys-ldap/etc/update-seeds.conf X-VCS-Directories: gkeys-ldap/etc/ gkeys-ldap/bin/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c4e60a2dc6995a2b0be701769204d11fe7d1db0f X-VCS-Branch: master Date: Mon, 5 Jan 2015 23:12:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c6c466d-770a-4a97-81fa-e7bef3581a1e X-Archives-Hash: 606f258260eba1ad6f82b96ac325d74d commit: c4e60a2dc6995a2b0be701769204d11fe7d1db0f Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 5 02:17:41 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 5 22:21:33 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c4e60a2d Remove GKEYS_CONF from command line Remove redundant echo in die/success functions --- gkeys-ldap/bin/update-seeds.sh | 8 ++++---- gkeys-ldap/etc/update-seeds.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh index 19c9d72..b8b4bfb 100755 --- a/gkeys-ldap/bin/update-seeds.sh +++ b/gkeys-ldap/bin/update-seeds.sh @@ -6,8 +6,8 @@ cwd=$(pwd) source ${cwd}/update-seeds.conf source ${cwd}/testpath -die(){ echo "$@" 1>&2; echo ""; exit 1; } -success(){ echo "$@"; echo ""; exit 0; } +die(){ echo "$@" 1>&2; exit 1; } +success(){ echo "$@"; exit 0; } clone_api(){ local target=dirname ${API_DIR} @@ -28,7 +28,7 @@ fi echo " *** Fetching new seeds from LDAP" cd ${GKEYS_DIR} -gkeys-ldap -c ${GKEYS_CONF} update-seeds -C gentoo-devs || die "Seed file generation failed... aborting" +gkeys-ldap update-seeds -C gentoo-devs || die "Seed file generation failed... aborting" echo " *** Checking if seed files are up-to-date" if ! diff -q ${GKEYS_DIR}/${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS} > /dev/null ;then @@ -42,7 +42,7 @@ else fi echo "Signing new developers.seeds file" -gkeys -c ${GKEYS_CONF} sign -n ${GKEYS_SIGN} -F ${API_DIR}/${API_SEEDS} || die " *** Signing failed... exiting" +gkeys sign -n ${GKEYS_SIGN} -F ${API_DIR}/${API_SEEDS} || die " *** Signing failed... exiting" echo "Committing changes to api repo..." cd ${API_DIR} diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf index 94aff1a..eb05c92 100644 --- a/gkeys-ldap/etc/update-seeds.conf +++ b/gkeys-ldap/etc/update-seeds.conf @@ -4,7 +4,7 @@ export API_DIR="/var/lib/gkeys/api" export API_SEEDS="files/gentoo-keys/seeds/gentoo-devs.seeds" export API_URL="git+ssh://git@git.gentoo.org/proj/api.git" export GKEYS_COMMIT_MSG="Gentoo-keys: Update gentoo-devs.seeds" -export GKEYS_CONF="/var/lib/gkeys/gkeys.conf" +#export GKEYS_CONF="/var/lib/gkeys/gkeys.conf" export GKEYS_DIR="/var/lib/gkeys" export GKEYS_SEEDS="seeds/gentoo-devs.seeds" export GKEYS_SIG="sig"