some more fixes and tweaks to get things working in the new setup

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index bce0072e16e165c3d19bf1e8da26f73977d98c2e..8b7bfee49f5860e18269699fbec1325bb55824e6 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -167,12 +167,12 @@ case $COMMAND in
        ;;
 
     'import-subkey'|'i')
-       source "${MSHAREDIR}/import-key"
-       import_key "$@"
+       source "${MSHAREDIR}/import_subkey"
+       import_subkey "$@"
        ;;
 
     'gen-subkey'|'g')
-       source "${MSHAREDIR}/import_key"
+       source "${MSHAREDIR}/gen_subkey"
        gen_subkey "$@"
        ;;
 
@@ -182,6 +182,7 @@ case $COMMAND in
        ;;
 
     'subkey-to-ssh-agent'|'s')
+       source "${MSHAREDIR}/subkey_to_ssh_agent"
        subkey_to_ssh_agent "$@"
        ;;