[elpa] externals/ssh-deploy f0eb826 030/173: Fixed a bug in protocol definition and started with support for multiple protocols.

[Stefan Monnier]

branch: externals/ssh-deploy
commit f0eb8269167c1db75d4a7a93c8b87572e1f5ae16
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Fixed a bug in protocol definition and started with support for multiple 
protocols.
---
 ssh-deploy.el | 53 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index 95884dc..eb8cd27 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -79,7 +79,7 @@
   :type 'boolean
   :group 'ssh-deploy)
 
-(defcustom ssh-deploy-protocol 'ssh'
+(defcustom ssh-deploy-protocol "ssh"
   "String variable defining current protocol, 'ssh' by default."
   :type 'string
   :group 'ssh-deploy)
@@ -97,14 +97,17 @@
           (fboundp 'tramp-term--initialize)
           (fboundp 'tramp-term--do-ssh-login))
       (progn
-        (let ((hostname (replace-regexp-in-string ":.*$" "" remote-host)))
-          (let ((host (split-string hostname "@")))
-            (message "Opening tramp-terminal for remote host 'address@hidden' 
or '%s' translated from '%s'.." (car host) (car (last host)) hostname 
remote-host)
-            (unless (eql (catch 'tramp-term--abort (tramp-term--do-ssh-login 
host)) 'tramp-term--abort)
-              (tramp-term--initialize hostname)
-              (run-hook-with-args 'tramp-term-after-initialized-hook hostname)
-              (message "tramp-term initialized")))))
-    (message "tramp-term is not installed.")))
+       (if (string= ssh-deploy-protocol "ssh")
+           (progn
+             (let ((hostname (replace-regexp-in-string ":.*$" "" remote-host)))
+               (let ((host (split-string hostname "@")))
+                 (message "Opening tramp-terminal for remote host 
'address@hidden' or '%s' translated from '%s'.." (car host) (car (last host)) 
hostname remote-host)
+                 (unless (eql (catch 'tramp-term--abort 
(tramp-term--do-ssh-login host)) 'tramp-term--abort)
+                   (tramp-term--initialize hostname)
+                   (run-hook-with-args 'tramp-term-after-initialized-hook 
hostname)
+                   (message "tramp-term initialized")))))
+         (message "Terminal is only available for ssh protocol.")))
+         (message "tramp-term is not installed.")))
 
 (defun ssh-deploy-file-is-in-path (file path)
   "Return true if FILE is in the path PATH."
@@ -166,13 +169,15 @@
                          (ssh-deploy-run-shell-command command)))
                     (progn
                      (message "Uploading directory '%s' to '%s'.." path 
remote-path)
-                     (if (string= path local-root)
-                         (progn
-                           (let ((command (concat "scp -r " (concat 
(shell-quote-argument path) "*") " " (shell-quote-argument (concat 
remote-path)))))
-                             (ssh-deploy-run-shell-command command)))
-                       (progn
-                         (let ((command (concat "scp -r " 
(shell-quote-argument path) " " (shell-quote-argument (file-name-directory 
(directory-file-name remote-path))))))
-                           (ssh-deploy-run-shell-command command)))))))
+                     (if (string= ssh-deploy-protocol "ssh")
+                         (if (string= path local-root)
+                             (progn
+                               (let ((command (concat "scp -r " (concat 
(shell-quote-argument path) "*") " " (shell-quote-argument (concat 
remote-path)))))
+                                 (ssh-deploy-run-shell-command command)))
+                           (progn
+                             (let ((command (concat "scp -r " 
(shell-quote-argument path) " " (shell-quote-argument (file-name-directory 
(directory-file-name remote-path))))))
+                               (ssh-deploy-run-shell-command command))))
+                       (message "Only ssh protocol is supported for directory 
operations")))))
               (progn
                 (message "Downloading path '%s' to '%s'.." remote-path path)
                 (if file-or-directory
@@ -182,13 +187,15 @@
                        (ssh-deploy-run-shell-command command)))
                   (progn
                    (message "Downloading directory '%s' to '%s'.." remote-path 
path)
-                   (if (string= path local-root)
-                       (progn
-                         (let ((command (concat "scp -r " (concat 
(shell-quote-argument remote-path) "*") " " (shell-quote-argument path))))
-                           (ssh-deploy-run-shell-command command)))
-                     (progn
-                         (let ((command (concat "scp -r " 
(shell-quote-argument remote-path) " " (shell-quote-argument 
(file-name-directory (directory-file-name path))))))
-                           (ssh-deploy-run-shell-command command)))))))))
+                     (if (string= ssh-deploy-protocol "ssh")
+                         (if (string= path local-root)
+                             (progn
+                               (let ((command (concat "scp -r " (concat 
(shell-quote-argument remote-path) "*") " " (shell-quote-argument path))))
+                                 (ssh-deploy-run-shell-command command)))
+                           (progn
+                             (let ((command (concat "scp -r " 
(shell-quote-argument remote-path) " " (shell-quote-argument 
(file-name-directory (directory-file-name path))))))
+                               (ssh-deploy-run-shell-command command))))
+                       (message "Only ssh protocol is supported for directory 
operations")))))))
         (if ssh-deploy-debug
             (message "Path '%s' is not in the root '%s'" path local-root))))))