From 5c3a02ae973f41fad95cf740ce89a3510850adf4 Mon Sep 17 00:00:00 2001 From: Nguyen Huu Thuong Date: Fri, 12 Jun 2020 03:20:07 +0200 Subject: [PATCH] not process empty line on scp --- .github/workflows/deploy.yml | 18 +++++++++--------- README.md | 6 +++--- entrypoint.sh | 5 ++++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a2bc76c..69ee848 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v1 - name: ssh scp ssh pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@master + uses: cross-the-world/ssh-scp-ssh-pipelines@latest env: WELCOME: "ssh scp ssh pipelines" LASTSSH: "Doing something after copying" @@ -22,10 +22,10 @@ jobs: port: ${{ secrets.DC_PORT }} connect_timeout: 10s first_ssh: |- - rm -rf /home/github/test - ls -la - echo $WELCOME - mkdir -p /home/github/test/test1 && + rm -rf /home/github/test + ls -la + echo $WELCOME + mkdir -p /home/github/test/test1 && mkdir -p /home/github/test/test2 && scp: |- './test/*' => /home/github/test/ @@ -37,9 +37,9 @@ jobs: || ls -la - name: scp ssh pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@master + uses: cross-the-world/ssh-scp-ssh-pipelines@latest env: - WELCOME: "scp ssh pipelines" + LASTSSH: "Doing something after copying" with: host: ${{ secrets.DC_HOST }} user: ${{ secrets.DC_USER }} @@ -52,7 +52,7 @@ jobs: ls -la - name: scp pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@master + uses: cross-the-world/ssh-scp-ssh-pipelines@latest env: WELCOME: "scp pipelines" with: @@ -60,4 +60,4 @@ jobs: user: ${{ secrets.DC_USER }} pass: ${{ secrets.DC_PASS }} scp: |- - './test/*' => /home/github/test/ \ No newline at end of file + './test/*' => /home/github/test/ \ No newline at end of file diff --git a/README.md b/README.md index 3e0ad98..ffd2fc4 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ e.g. #### ssh scp ssh pipelines ```yaml - name: ssh scp ssh pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@v1.0.1 + uses: cross-the-world/ssh-scp-ssh-pipelines@latest env: WELCOME: "ssh scp ssh pipelines" LASTSSH: "Doing something after copying" @@ -85,7 +85,7 @@ e.g. #### scp ssh pipelines ```yaml - name: scp ssh pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@v1.0.1 + uses: cross-the-world/ssh-scp-ssh-pipelines@latest env: LASTSSH: "Doing something after copying" with: @@ -103,7 +103,7 @@ e.g. #### scp pipelines ```yaml - name: scp pipelines - uses: cross-the-world/ssh-scp-ssh-pipelines@v1.0.1 + uses: cross-the-world/ssh-scp-ssh-pipelines@latest with: host: ${{ secrets.DC_HOST }} user: ${{ secrets.DC_USER }} diff --git a/entrypoint.sh b/entrypoint.sh index 43664c5..cfa62a7 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -93,7 +93,10 @@ executeSCP() { while IFS= read -r LINE; do delimiter="=>" - LINE=`echo $LINE` + LINE=$(echo $LINE) + if [[ -z "${LINE}" ]]; then + continue + fi s=$LINE$delimiter arr=() while [[ $s ]]; do