[csw-devel] SF.net SVN: gar:[20080] csw/mgar/pkg/cswpki/trunk

[bdwalton at users.sourceforge.net]

Revision: 20080
          http://gar.svn.sourceforge.net/gar/?rev=20080&view=rev
Author:   bdwalton
Date:     2013-01-10 23:00:37 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
cswpki/trunk: handle variations of Yes when prompting for key install; mantis 5036

Modified Paths:
--------------
    csw/mgar/pkg/cswpki/trunk/Makefile
    csw/mgar/pkg/cswpki/trunk/files/cswpki

Modified: csw/mgar/pkg/cswpki/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswpki/trunk/Makefile	2013-01-10 19:38:15 UTC (rev 20079)
+++ csw/mgar/pkg/cswpki/trunk/Makefile	2013-01-10 23:00:37 UTC (rev 20080)
@@ -1,6 +1,6 @@
 # $Id: Makefile 15522 2011-09-04 16:29:44Z bdwalton $
 NAME = cswpki
-VERSION = 1.0
+VERSION = 1.1
 
 DESCRIPTION = The OpenCSW PKI Collection
 define BLURB
@@ -41,4 +41,4 @@
 		done; \
 		cp $(WORKDIR)/cswpki $(BIN); \
 		cp $(WORKDIR)/gpl-2.0.txt $(DOC)/license; \
-		chmod 700 $(VAR) )
\ No newline at end of file
+		chmod 700 $(VAR) )

Modified: csw/mgar/pkg/cswpki/trunk/files/cswpki
===================================================================
--- csw/mgar/pkg/cswpki/trunk/files/cswpki	2013-01-10 19:38:15 UTC (rev 20079)
+++ csw/mgar/pkg/cswpki/trunk/files/cswpki	2013-01-10 23:00:37 UTC (rev 20080)
@@ -60,17 +60,20 @@
 	    read install
 	fi
 
-	if [ "${install}" = "yes" ]; then
-	    echo
-	    echo "Importing the key used for: ${friendly_name}"
-	    echo
-	    gpg --homedir="${pki_db:-/var/opt/csw/pki/}" --import "$key"
-	    echo
-	    echo
-	else
-	    echo
-	    echo "Skipping the import of the key used for: ${friendly_name}"
-	    echo
-	fi
+	case "${install}" in
+	    [Yy]|[Yy][Ee][Ss])
+		echo
+		echo "Importing the key used for: ${friendly_name}"
+		echo
+		gpg --homedir="${pki_db:-/var/opt/csw/pki/}" --import "$key"
+		echo
+		echo
+		;;
+	    *)
+		echo
+		echo "Skipping the import of the key used for: ${friendly_name}"
+		echo
+		;;
+	esac
     done
 fi

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