Compare commits

...

2 Commits

Author SHA1 Message Date
Nguyen Huu Thuong 6582a0be19 Merge branch 'master' into latest 2021-03-04 20:35:11 +01:00
Nguyen Huu Thuong aa298e0d20 minor fix: catch ';' 2021-03-04 20:32:58 +01:00
2 changed files with 8 additions and 4 deletions

View File

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

4
app.py
View File

@ -86,8 +86,10 @@ def ssh_process(ssh, input_ssh):
c = path.expandvars(commands[i]) c = path.expandvars(commands[i])
if c == "": if c == "":
continue 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 c = c[0:-2] if i == (l-1) else c
elif c.endswith(';'):
c = c[0:-1] if i == (l-1) else c
else: else:
c = f"{c} &&" if i < (l-1) else c c = f"{c} &&" if i < (l-1) else c
command_str = f"{command_str} {c}" command_str = f"{command_str} {c}"