[csw-devel] SF.net SVN: opencsw:[443] catalog_signatures/bin/daemon_verify

[bdwalton at users.sourceforge.net]

Revision: 443
          http://opencsw.svn.sourceforge.net/opencsw/?rev=443&view=rev
Author:   bdwalton
Date:     2011-07-21 03:14:26 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
streamline daemon_verify to use inherited APP_ variables

Signed-off-by: Ben Walton <bwalton at opencsw.org>

Modified Paths:
--------------
    catalog_signatures/bin/daemon_verify

Modified: catalog_signatures/bin/daemon_verify
===================================================================
--- catalog_signatures/bin/daemon_verify	2011-07-21 03:14:06 UTC (rev 442)
+++ catalog_signatures/bin/daemon_verify	2011-07-21 03:14:26 UTC (rev 443)
@@ -2,29 +2,11 @@
 
 PATH=/opt/csw/bin:/opt/csw/gnu:$PATH
 
-DAEMON_BIN="$(dirname $0)"
-DAEMON_HOME="${DAEMON_BIN}/.."
-DAEMON_GPG="${DAEMON_HOME}/etc/gpg"
-DAEMON_TMP="${DAEMON_HOME}/tmp"
-GPG_ENV="${DAEMON_TMP}/gpg-agent.conf"
 DAEMON="${DAEMON_BIN}/catalog_gpg"
 
-while [ ! -f "${GPG_ENV}" ]; do
-    echo "Waiting for GPG agent to be started by the daemon init."
-    sleep 10
-done
-
-source "${GPG_ENV}"
-export GPG_AGENT_INFO
-export GPG_TTY=`tty`
-if [ ! -d "$(dirname ${GPG_AGENT_INFO})" ]; then
-    echo "${GPG_ENV} exists but seems invalid."
-    exit 1
-fi
-
 while /bin/true; do
     # test that the passphrase is still cached...
-    gpg --yes --batch --homedir "${DAEMON_GPG}" --clearsign --armor --output "${DAEMON_TMP}/$(basename ${DAEMON}).asc" "${DAEMON}"
+    gpg --yes --batch --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${DAEMON}).asc" "${DAEMON}"
 
     if [ $? -eq 0 ]; then
 	echo "$(date +%c): Ok."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.