Merge branch 'master' into latest

.github/workflows/deploy.yml

@@ -24,14 +24,16 @@ jobs:
         with:
           host: ${{ secrets.DC_HOST }}
           user: ${{ secrets.DC_USER }}
-          pass: ${{ secrets.DC_PASS }}
+          key: ${{ secrets.DC_PASS }}
           port: ${{ secrets.DC_PORT }}
           connect_timeout: 10s
           first_ssh: |-
             rm -rf /home/github/test  
             ls -la 
-            echo $WELCOME   
-            mkdir -p /home/github/test/test1 &&    
+            echo $WELCOME ||
+            ls debug
+            mkdir -p /home/github/test/test1 &&
+            ls debug
             mkdir -p /home/github/test/test2 &&
           scp: |-
             './test/*' => /home/github/test/

app.py

@@ -86,8 +86,10 @@ def ssh_process(ssh, input_ssh):
         c = path.expandvars(commands[i])
         if c == "":
             continue
-        if c.endswith('&&') or c.endswith('||') or c.endswith(';'):
+        if c.endswith('&&') or c.endswith('||'):
             c = c[0:-2] if i == (l-1) else c
+        elif c.endswith(';'):
+            c = c[0:-1] if i == (l-1) else c
         else:
             c = f"{c} &&" if i < (l-1) else c
         command_str = f"{command_str} {c}"
@@ -96,8 +98,6 @@ def ssh_process(ssh, input_ssh):
 
     stdin, stdout, stderr = ssh.exec_command(command_str)
     
-    ssh_exit_status = stdout.channel.recv_exit_status()
-    
     out = "".join(stdout.readlines())
     out = out.strip() if out is not None else None
     if out:
@@ -107,9 +107,6 @@ def ssh_process(ssh, input_ssh):
     err = err.strip() if err is not None else None
     if err:
         print(f"Error: \n{err}")
-    
-    if  ssh_exit_status != 0:
-        print(f"ssh exit status: {ssh_exit_status}")
         sys.exit(1)
         
     pass