diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-01-04 18:17:41 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-01-05 14:21:33 -0800 |
| commit | c4e60a2dc6995a2b0be701769204d11fe7d1db0f (patch) | |
| tree | 029b199b98ea05405f81c14fc7dd7fd4e895b9e0 /gkeys-ldap | |
| parent | gkeyldap: fix missed Seeds init logger param. (diff) | |
| download | gentoo-keys-c4e60a2dc6995a2b0be701769204d11fe7d1db0f.tar.gz gentoo-keys-c4e60a2dc6995a2b0be701769204d11fe7d1db0f.tar.bz2 gentoo-keys-c4e60a2dc6995a2b0be701769204d11fe7d1db0f.zip | |
Remove GKEYS_CONF from command line
Remove redundant echo in die/success functions
Diffstat (limited to 'gkeys-ldap')
| -rwxr-xr-x | gkeys-ldap/bin/update-seeds.sh | 8 | ||||
| -rw-r--r-- | 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" |