aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-01-04 18:17:41 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-01-05 14:21:33 -0800
commitc4e60a2dc6995a2b0be701769204d11fe7d1db0f (patch)
tree029b199b98ea05405f81c14fc7dd7fd4e895b9e0 /gkeys-ldap/bin
parentgkeyldap: fix missed Seeds init logger param. (diff)
downloadgentoo-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/bin')
-rwxr-xr-xgkeys-ldap/bin/update-seeds.sh8
1 files changed, 4 insertions, 4 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}