[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     5e2b4116b11b1afea2fe6cd7496f878fcad80ee8
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  5 01:22:49 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 22:15:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=5e2b4116

bin/update-seeds.sh: Update for hyphenated sub-command

---
 gkeys-ldap/bin/update-seeds.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 717636a..19c9d72 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -28,7 +28,7 @@ fi
 
 echo " *** Fetching new seeds from LDAP"
 cd ${GKEYS_DIR}
-gkeys-ldap -c ${GKEYS_CONF} updateseeds -C gentoo-devs || die "Seed file generation failed... aborting"
+gkeys-ldap -c ${GKEYS_CONF} 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

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     096247c6e09b6f741368f89390c85b06b81a8820
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  5 20:41:42 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 23:07:09 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=096247c6

gkeyldap/bin/make-rel.kering.sh: Initial rough-in of a keyring release script

---
 gkeys-ldap/bin/make-rel-keyring.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gkeys-ldap/bin/make-rel-keyring.sh b/gkeys-ldap/bin/make-rel-keyring.sh
new file mode 100755
index 0000000..e2b6ceb
--- /dev/null
+++ b/gkeys-ldap/bin/make-rel-keyring.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+die(){ echo "$@" 1>&2; exit 1; }
+success(){ echo "$@"; exit 0; }
+
+timestamp=$(date +"%Y%m%d%H%M")
+echo "timestamp = ${timestamp}"
+
+filename="gentoo-keys-${timestamp}.tar.xz"
+echo "filename = ${filename}"
+
+target="/var/lib/gkeys/keyring-releases"
+base="/var/lib/gkeys/keyrings"
+src="gentoo"
+repo="/var/lib/gkeys/gkey-seeds"
+scptarget="dolsen@dev.gentoo.org:~/public_html/releases/keyrings/"
+
+#cd /var/lib/gkeys || echo "failed to cd..." && exit 1
+
+echo "Beginning tar..."
+tar -cpJf $target/$filename --exclude-backups -C $base $src  || die "tar failed"
+
+gkeys sign -F $target/$filename || die "Signing file failed"
+
+# cd into gkey-seeds, create a tag
+
+echo "Tagging gkey-seeds repo with release timestamp"
+
+cd $repo
+git tag -m "version bump: ${filename}" "${timestamp}"  || die "git tag creation failed"
+git push --tags  || echo "Failed to push tags"
+
+echo "${filename} created and signed..."
+echo "Uploading to ${scptarget}..."
+scp "${target}/${filename} ${scptarget}" || die "scp failed"
+scp "${target}/${filename}.sig ${scptarget}" || die "scp failed"
+
+success "Ready to bump ebuild"

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     454c72905c4eeee38ad3218e5a5c5abef185b968
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 19:37:23 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 19:37:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=454c7290

gkeys-ldap: Add --signed to push commands in update-seeds.sh

 gkeys-ldap/bin/update-seeds.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index c8f9e78..f7f968f 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -66,7 +66,7 @@ cd ${GKEY_SEEDS_DIR}
 git add ${GKEY_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${GKEY_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
 git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
-git push origin master || die " *** git push failed"
+git push --signed origin master || die " *** git push failed"
 cd ..
 
 echo "Committing changes to api repo..."
@@ -76,7 +76,7 @@ cd ${API_DIR}
 git add ${API_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
 git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
-git push origin master || die " *** git push failed"
+git push --signed origin master || die " *** git push failed"
 
 echo "Pushing the log file to ${LOG_UPLOAD_URL}"
 LOG_FILE=$( cat "${LOG_DIR}/gkeys-ldap-lastlog" )

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     5c16c17df122e9103db2a19ff5fdc118a9599a5a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 19:46:30 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 19:46:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=5c16c17d

gkeys-ldap: Remove keychain line from update-seeds.sh

 gkeys-ldap/bin/update-seeds.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index f7f968f..ed44df7 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -6,8 +6,6 @@ cwd=$(pwd)
 source ${cwd}/update-seeds.conf
 source ${cwd}/testpath
 
-eval `keychain --noask --eval ${SSH_KEY} ${GPG_KEY}`
-
 die(){ echo "$@" 1>&2; exit 1; }
 success(){ echo "$@"; exit 0; }
 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     96860a8921918b9b516afef1f322b7b059b58035
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 02:07:22 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 05:22:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=96860a89

gkeys-ldap update-seeds.sh: Add -S option to git commits to ensure they are gpg signed

This way if the git config is not set to enforce signing, this will ensure it is signed.

 gkeys-ldap/bin/update-seeds.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index ed44df7..d241cda 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -63,7 +63,7 @@ echo "Committing changes to gkey-seeds repo..."
 cd ${GKEY_SEEDS_DIR}
 git add ${GKEY_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${GKEY_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
-git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
+git commit -S -m"${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 cd ..
 
@@ -73,7 +73,7 @@ cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG} ${API_DIR}/${API_SEEDS}.${GKEYS_
 cd ${API_DIR}
 git add ${API_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
-git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
+git commit -S -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 
 echo "Pushing the log file to ${LOG_UPLOAD_URL}"

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     0cef7485299fc61aea928eeb669fcfb7cbaa55fb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 23:49:47 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 05:22:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=0cef7485

gkeys-ldap updateseeds.sh: Shellcheck cleanup

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys-ldap/bin/update-seeds.sh | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index a2e0f87..a29de66 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: update-seeds.sh,v 0.2.1 2014/10/12 dolsen Exp $
 
 FORCE=${1}
@@ -6,22 +6,22 @@ HAS_UPDATES=false
 
 # configuration to run from a checkout with a custom config
 cwd=$(pwd)
-source ${cwd}/update-seeds.conf
-source ${cwd}/testpath
+source "${cwd}/update-seeds.conf"
+source "${cwd}/testpath"
 
 die(){ echo "$@" 1>&2; exit 1; }
 success(){ echo "$@"; exit 0; }
 
 clone_api(){
-    local target=dirname ${API_DIR}
-    cd target
-    git clone ${API_URL}
+    local target=dirname "${API_DIR}"
+    cd target || die " *** Failed to change directory... exiting"
+    git clone "${API_URL}"
 }
 
 clone_gkey_seeds(){
-    local target=dirname ${GKEY_SEEDS_DIR}
-    cd target
-    git clone ${GKEY_SEEDS_URL}
+    local target=dirname "${GKEY_SEEDS_DIR}"
+    cd target || die " *** Failed to change directory... exiting"
+    git clone "${GKEY_SEEDS_URL}"
 }
 
 # start update process
@@ -29,56 +29,56 @@ echo "Beginning seed file update"
 
 echo " *** updating gkey-seeds repo"
 # update api checkout
-if [[ ! -d ${GKEY_SEEDS_DIR} ]]; then
+if [[ ! -d "${GKEY_SEEDS_DIR}" ]]; then
     clone_gkey_seeds
 else
-    cd ${GKEY_SEEDS_DIR} && git pull
+    cd "${GKEY_SEEDS_DIR}" && git pull
 fi
 
 echo " *** updating api.gentoo.org repo"
 # update api checkout
-if [[ ! -d ${API_DIR} ]]; then
+if [[ ! -d "${API_DIR}" ]]; then
     clone_api
 else
-    cd ${API_DIR} && git pull
+    cd "${API_DIR}" && git pull
 fi
 
 echo " *** Fetching new seeds from LDAP"
-cd ${GKEYS_DIR}
+cd "${GKEYS_DIR}" || die " *** Failed to change directory... exiting"
 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} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} > /dev/null ;then
+if ! diff -q "${GKEYS_DIR}/${GKEYS_SEEDS}" "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" > /dev/null ;then
     HAS_UPDATES=true
 fi
-if [[ "${FORCE}" == "force" || ${HAS_UPDATES} ]] ; then
+if [[ "${FORCE}" == "force" || "${HAS_UPDATES}" ]] ; then
     echo " *** Spotted differences"
     echo " *** Updating old seeds with a new one"
     # copy seeds to gkey-seeds
     echo "  ... cp ${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS}"
-    cp ${GKEYS_SEEDS} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}
+    cp "${GKEYS_SEEDS}" "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}"
 else
     success " *** No changes detected"
     exit 0
 fi
 
 echo "Signing new developers.seeds file"
-gkeys sign -n ${GKEYS_SIGN} -F ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} || die " *** Signing failed... exiting"
+gkeys sign -n "${GKEYS_SIGN}" -F "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" || die " *** Signing failed... exiting"
 
 echo "Committing changes to gkey-seeds repo..."
-cd ${GKEY_SEEDS_DIR}
-git add ${GKEY_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
-git add ${GKEY_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
+cd "${GKEY_SEEDS_DIR}" || die " *** Failed to change directory... exiting"
+git add "${GKEY_SEEDS}"  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
+git add "${GKEY_SEEDS}.${GKEYS_SIG}" || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
 git commit -S -m"${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 cd ..
 
 echo "Committing changes to api repo..."
-cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} ${API_DIR}/${API_SEEDS} || die " *** Failed to copy modified ${GKEYS_SEEDS} file"
-cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG} ${API_DIR}/${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to copy modified ${GKEYS_SEEDS}.${GKEYS_SIG} file"
-cd ${API_DIR}
-git add ${API_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
-git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
+cp "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" "${API_DIR}/${API_SEEDS}" || die " *** Failed to copy modified ${GKEYS_SEEDS} file"
+cp "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG}" "${API_DIR}/${API_SEEDS}.${GKEYS_SIG}" || die " *** Failed to copy modified ${GKEYS_SEEDS}.${GKEYS_SIG} file"
+cd "${API_DIR}" || die " *** Failed to change directory... exiting"
+git add "${API_SEEDS}"  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
+git add "${API_SEEDS}.${GKEYS_SIG}" || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
 git commit -S -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     3fb36c4ca353adffd39f40cda2e16969e099c3c1
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 15:11:06 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 05:22:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=3fb36c4c

gkeys-ldap updateseeds.sh: Add a force override option

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys-ldap/bin/update-seeds.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index d241cda..a2e0f87 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 # $Id: update-seeds.sh,v 0.2.1 2014/10/12 dolsen Exp $
 
+FORCE=${1}
+HAS_UPDATES=false
+
 # configuration to run from a checkout with a custom config
 cwd=$(pwd)
 source ${cwd}/update-seeds.conf
@@ -46,6 +49,9 @@ gkeys-ldap update-seeds -C gentoo-devs || die "Seed file generation failed... ab
 
 echo " *** Checking if seed files are up-to-date"
 if ! diff -q ${GKEYS_DIR}/${GKEYS_SEEDS} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} > /dev/null ;then
+    HAS_UPDATES=true
+fi
+if [[ "${FORCE}" == "force" || ${HAS_UPDATES} ]] ; then
     echo " *** Spotted differences"
     echo " *** Updating old seeds with a new one"
     # copy seeds to gkey-seeds

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     1619761a318e0244a5c9fb5b5e97aa55e80b7888
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 13:55:53 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 13:55:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=1619761a

bin/gkeys-ldap: Force python2.7 for now

Vulture now has python3.6 as default, but python-ldap-3* is not yet stable

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys-ldap/bin/gkeys-ldap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkeys-ldap/bin/gkeys-ldap b/gkeys-ldap/bin/gkeys-ldap
index 3d23ac1..73c5d55 100755
--- a/gkeys-ldap/bin/gkeys-ldap
+++ b/gkeys-ldap/bin/gkeys-ldap
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
 '''Gentoo-keys is a gpg key manager for managing

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     f4e9abe5ea21488a7dcaf9ec629f554679bc4d89
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 15:37:26 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 01:03:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=f4e9abe5

gkeys-ldap update-seeds.sh: Fix missed space in command

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys-ldap/bin/update-seeds.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index a29de66..171052c 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 # $Id: update-seeds.sh,v 0.2.1 2014/10/12 dolsen Exp $
 
-FORCE=${1}
+set -o pipefail
+
+if [ -z "${1}" ]; then
+    FORCE='NO'
+else
+    FORCE=${1}
+fi
+
 HAS_UPDATES=false
 
 # configuration to run from a checkout with a custom config
@@ -49,10 +56,13 @@ gkeys-ldap update-seeds -C gentoo-devs || die "Seed file generation failed... ab
 
 echo " *** Checking if seed files are up-to-date"
 if ! diff -q "${GKEYS_DIR}/${GKEYS_SEEDS}" "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" > /dev/null ;then
+    echo "*** Detected a diff, HAS_UPDATES=true"
+    HAS_UPDATES=true
+elif [[ "${FORCE}" == "force" ]] ; then
     HAS_UPDATES=true
 fi
-if [[ "${FORCE}" == "force" || "${HAS_UPDATES}" ]] ; then
-    echo " *** Spotted differences"
+
+if [[ "${HAS_UPDATES}" ]] ; then
     echo " *** Updating old seeds with a new one"
     # copy seeds to gkey-seeds
     echo "  ... cp ${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS}"
@@ -69,7 +79,7 @@ echo "Committing changes to gkey-seeds repo..."
 cd "${GKEY_SEEDS_DIR}" || die " *** Failed to change directory... exiting"
 git add "${GKEY_SEEDS}"  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add "${GKEY_SEEDS}.${GKEYS_SIG}" || die " *** Failed to add ${GKEYS_SEEDS}.sig file"
-git commit -S -m"${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
+git commit -S -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 cd ..
 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

[Brian Dolbec]

commit:     d8bcd6d2ccccd0c7a2fc5769108ac338f2446625
Author:     Brian Dolbec dolsen <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 03:45:24 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 03:45:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=d8bcd6d2

gkeys-ldap update-seeds.sh: Fix the HAS_UPDATES conditional

 gkeys-ldap/bin/update-seeds.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 171052c..41a3ad8 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -62,7 +62,7 @@ elif [[ "${FORCE}" == "force" ]] ; then
     HAS_UPDATES=true
 fi
 
-if [[ "${HAS_UPDATES}" ]] ; then
+if [[ ${HAS_UPDATES} == true ]] ; then
     echo " *** Updating old seeds with a new one"
     # copy seeds to gkey-seeds
     echo "  ... cp ${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS}"