From: Evan Broder <broder@mit.edu>
Date: Sun, 26 Oct 2008 21:44:58 +0000 (-0400)
Subject: Fix some bugs in invirt-update-vnc-cert
X-Git-Tag: 0.0.3^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-vnc-client.git/commitdiff_plain/e668088ccdedcefbd0bd290d98532d4f16458e5e

Fix some bugs in invirt-update-vnc-cert

svn path=/trunk/packages/invirt-vnc-client/; revision=1345
---

diff --git a/debian/changelog b/debian/changelog
index 367cb46..9f3502a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-vnc-client (0.0.3) unstable; urgency=low
+
+  * Fix some shell script errors thanks to the globs
+
+ -- Evan Broder <broder@mit.edu>  Sun, 26 Oct 2008 17:44:45 -0400
+
 invirt-vnc-client (0.0.2) unstable; urgency=low
 
   * DEBHELPER FAIL - I wanted invirt-update-vnc-cert.sh installed as
diff --git a/debian/invirt-update-vnc-cert b/debian/invirt-update-vnc-cert
index fa73f27..b07832a 100755
--- a/debian/invirt-update-vnc-cert
+++ b/debian/invirt-update-vnc-cert
@@ -8,9 +8,9 @@ if [ "$(ls /etc/invirt/vnc-cert.d)" == "" ]; then
 fi
 
 TMP_DIR="$(mktemp -d)"
-for i in $(ls /etc/invirt/vnc-cert.d/*.crt); do
-    keytool -noprompt -alias "${i%.crt}" -file "/etc/invirt/vnc-cert.d/$i" \
-        -keystore "$TMP_DIR/trust.store" -storepass "foobar"
+for i in /etc/invirt/vnc-cert.d/*.crt; do
+    keytool -import -noprompt -alias "$(basename "${i%.crt}")" -file \
+	"$i" -keystore "$TMP_DIR/trust.store" -storepass "foobar"
 done
 
 jar uf /usr/share/invirt-vnc-client/VncViewer.jar -C "$TMP_DIR" trust.store