[csw-devel] SF.net SVN: opencsw:[422] catalog_signatures/bin/catalog_daemon

[bdwalton at users.sourceforge.net]

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

Log Message:
-----------
ensure that the webrick daemon can determin a useful --homedir setting from the environment

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

Modified Paths:
--------------
    catalog_signatures/bin/catalog_daemon

Modified: catalog_signatures/bin/catalog_daemon
===================================================================
--- catalog_signatures/bin/catalog_daemon	2011-07-21 03:06:41 UTC (rev 421)
+++ catalog_signatures/bin/catalog_daemon	2011-07-21 03:07:01 UTC (rev 422)
@@ -3,8 +3,8 @@
 PATH=/opt/csw/bin:/opt/csw/gnu:$PATH
 
 DAEMON_BIN="$(dirname $0)"
-DAEMON_HOME="${DAEMON_BIN}/.."
-DAEMON_GPG="${DAEMON_HOME}/gpg"
+DAEMON_HOME="$(dirname ${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
@@ -22,6 +22,7 @@
 fi
 
 export GPG_AGENT_INFO
+export DAEMON_GPG
 
 # warm up the passphrase...
 gpg --yes --homedir "${DAEMON_GPG}" --clearsign --armor --output "${DAEMON_TMP}/$(basename ${DAEMON}).asc" "${DAEMON}"


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