[vcl] branch develop updated: VCL-1127 - Make changes to handle Cygwin's change of sshd service name to cygsshd

[jfthomps]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git


The following commit(s) were added to refs/heads/develop by this push:
     new 826b1dd  VCL-1127 - Make changes to handle Cygwin's change of sshd 
service name to cygsshd
826b1dd is described below

commit 826b1ddc09a5c47369b144c5b12461bbb3772d63
Author: Josh Thompson <jftho...@ncsu.edu>
AuthorDate: Tue May 12 13:14:43 2020 -0400

    VCL-1127 - Make changes to handle Cygwin's change of sshd service name to 
cygsshd
    
    gen-node-key.sh: modified line that determines name for ssh service - added 
spaces after '=' for arguments, without the spaces, Windows gives a weird 1060 
error
---
 managementnode/bin/gen-node-key.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/managementnode/bin/gen-node-key.sh 
b/managementnode/bin/gen-node-key.sh
index 8feb0f3..370e14b 100755
--- a/managementnode/bin/gen-node-key.sh
+++ b/managementnode/bin/gen-node-key.sh
@@ -153,7 +153,7 @@ esac
 
 # if OS is CYGWIN, try to determine sshd service name
 if [[ $OS =~ (CYGWIN) ]]; then
-       sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex 
type=service state=all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' | 
sed 's/
//g'"`
+       sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex type= 
service state= all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' | sed 
's/
//g'"`
        if [[ $sshdservice != "" && $sshdservice != "sshd" ]]; then
                echo "Detected CYGWIN with alternate sshd service name: 
$sshdservice"
                SSHSTOP="net stop $sshdservice"