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

[bdwalton at users.sourceforge.net]

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

Log Message:
-----------
make use of newly exported APP_DAEMON variable in daemon_verify and catalog_daemon scripts

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

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

Modified: catalog_signatures/bin/catalog_daemon
===================================================================
--- catalog_signatures/bin/catalog_daemon	2011-07-21 03:21:58 UTC (rev 464)
+++ catalog_signatures/bin/catalog_daemon	2011-07-21 03:22:19 UTC (rev 465)
@@ -3,11 +3,10 @@
 # APP_* should be inherited from the initialization script
 
 PATH=/opt/csw/bin:/opt/csw/gnu:$PATH
-DAEMON=${APP_BIN}/catalog_gpg
 
 # warm up the passphrase...
-gpg --yes --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${DAEMON}).asc" "${DAEMON}"
+gpg --yes --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${APP_DAEMON}).asc" "${APP_DAEMON}"
 
 screen -t verification 0 ${APP_BIN}/daemon_verify
 
-exec "${DAEMON}"
+exec "${APP_DAEMON}"

Modified: catalog_signatures/bin/daemon_verify
===================================================================
--- catalog_signatures/bin/daemon_verify	2011-07-21 03:21:58 UTC (rev 464)
+++ catalog_signatures/bin/daemon_verify	2011-07-21 03:22:19 UTC (rev 465)
@@ -2,12 +2,10 @@
 
 PATH=/opt/csw/bin:/opt/csw/gnu:$PATH
 
-DAEMON="${APP_BIN}/catalog_gpg"
-
 while /bin/true; do
 
     # test that the passphrase is still cached...
-    gpg --yes --batch --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${DAEMON}).asc" "${DAEMON}"
+    gpg --yes --batch --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${APP_DAEMON}).asc" "${APP_DAEMON}"
 
     if [ $? -eq 0 ]; then
 	echo "$(date +%c): Checking; Ok."


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