quote some strings to not confuse checkbashisms
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 11 Jun 2008 21:05:26 +0000 (17:05 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 11 Jun 2008 21:05:26 +0000 (17:05 -0400)
src/monkeysphere
src/monkeysphere-server

index c417625ee2fb3dee31e28a536d1ce138f695e7d4..aaeda117a0efd54d6a8ae7dcf4089fa7fe37fed8 100755 (executable)
@@ -54,9 +54,9 @@ gen_ae_subkey(){
     keyID="$1"
 
     # set subkey defaults
-    SUBKEY_TYPE=${KEY_TYPE:-RSA}
-    SUBKEY_LENGTH=${KEY_LENGTH:-1024}
-    SUBKEY_USAGE=${KEY_USAGE:-encrypt,auth}
+    SUBKEY_TYPE=${KEY_TYPE:-"RSA"}
+    SUBKEY_LENGTH=${KEY_LENGTH:-"1024"}
+    SUBKEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
 
     gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
        "$keyID" 2> /dev/null)
index 34239b6e489987af25fd84d1147692e8544da5cb..a109cf533229c78074e1fe543e37569b49618321 100755 (executable)
@@ -44,10 +44,10 @@ EOF
 # generate server gpg key
 gen_key() {
     # set key defaults
-    KEY_TYPE=${KEY_TYPE:-RSA}
-    KEY_LENGTH=${KEY_LENGTH:-2048}
-    KEY_USAGE=${KEY_USAGE:-encrypt,auth}
-    SERVICE=${SERVICE:-ssh}
+    KEY_TYPE=${KEY_TYPE:-"RSA"}
+    KEY_LENGTH=${KEY_LENGTH:-"2048"}
+    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
     USERID=${USERID:-"$SERVICE"://"$HOSTNAME_FQDN"}