chore: test

Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>

.github/workflows/codeql.yml

@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [ master ]
   schedule:
-    - cron: "41 23 * * 6"
+    - cron: '41 23 * * 6'
 
 jobs:
   analyze:
@@ -32,23 +32,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["go"]
+        language: [ 'go' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@v3
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/docker.yml

@@ -5,51 +5,56 @@ on:
     branches:
       - master
     tags:
-      - "v*"
+      - 'v*'
   pull_request:
     branches:
-      - "master"
+      - 'master'
 
 jobs:
   build-docker:
     runs-on: ubuntu-latest
     steps:
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
-          go-version: "^1"
+          go-version: '^1'
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Build binary
-        run: |
+        run : |
           make build_linux_amd64
+          make build_linux_arm
           make build_linux_arm64
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Docker meta
+      -
+        name: Docker meta
         id: docker-meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: |
             ${{ github.repository }}
@@ -60,14 +65,13 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
 
-      - name: Build and push
-        uses: docker/build-push-action@v6
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm,linux/arm64
           file: docker/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
-          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache,mode=max

.github/workflows/goreleaser.yml

@@ -3,7 +3,7 @@ name: Goreleaser
 on:
   push:
     tags:
-      - "*"
+      - '*'
 
 permissions:
   contents: write
@@ -12,21 +12,24 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      -
+        name: Checkout
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup go
-        uses: actions/setup-go@v5
+      -
+        name: Setup go
+        uses: actions/setup-go@v4
         with:
-          go-version: "^1"
+          go-version: '^1'
 
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v4
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
           version: latest
-          args: release --clean
+          args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -8,17 +8,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
-          go-version-file: go.mod
-          check-latest: true
-
+          go-version: '^1'
+      - name: Checkout repository
+        uses: actions/checkout@v3
       - name: Setup golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v3
         with:
           version: latest
           args: --verbose
@@ -30,10 +27,10 @@ jobs:
 
   testing:
     runs-on: ubuntu-latest
-    container: golang:1.22-alpine
+    container: golang:1.20-alpine
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: setup sshd server
         run: |
@@ -45,4 +42,4 @@ jobs:
           make test
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3

.gitignore

@@ -28,5 +28,3 @@ coverage.txt
 dist
 .cover
 release
-bin
-.idea

.goreleaser.yaml

@@ -3,78 +3,74 @@ before:
     - go mod tidy
 
 builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - darwin
-      - linux
-      - windows
-      - freebsd
-    goarch:
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - "5"
-      - "6"
-      - "7"
-    ignore:
-      - goos: darwin
-        goarch: arm
-      - goos: darwin
-        goarch: ppc64le
-      - goos: darwin
-        goarch: s390x
-      - goos: windows
-        goarch: ppc64le
-      - goos: windows
-        goarch: s390x
-      - goos: windows
-        goarch: arm
-        goarm: "5"
-      - goos: windows
-        goarch: arm
-        goarm: "6"
-      - goos: windows
-        goarch: arm
-        goarm: "7"
-      - goos: windows
-        goarch: arm64
-      - goos: freebsd
-        goarch: ppc64le
-      - goos: freebsd
-        goarch: s390x
-      - goos: freebsd
-        goarch: arm
-        goarm: "5"
-      - goos: freebsd
-        goarch: arm
-        goarm: "6"
-      - goos: freebsd
-        goarch: arm
-        goarm: "7"
-      - goos: freebsd
-        goarch: arm64
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w
-      - -X main.Version={{.Version}}
-    binary: >-
-      {{ .ProjectName }}-
-      {{- if .IsSnapshot }}{{ .Branch }}-
-      {{- else }}{{- .Version }}-{{ end }}
-      {{- .Os }}-
-      {{- if eq .Arch "amd64" }}amd64
-      {{- else if eq .Arch "amd64_v1" }}amd64
-      {{- else if eq .Arch "386" }}386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}-{{ .Arm }}{{ end }}
-    no_unique_dist_dir: true
-    hooks:
-      post:
-        - cmd: xz -k -9 {{ .Path }}
-          dir: ./dist/
+- env:
+  - CGO_ENABLED=0
+  goos:
+  - darwin
+  - linux
+  - windows
+  - freebsd
+  goarch:
+  - amd64
+  - arm
+  - arm64
+  goarm:
+  - "5"
+  - "6"
+  - "7"
+  ignore:
+    - goos: darwin
+      goarch: arm
+    - goos: darwin
+      goarch: ppc64le
+    - goos: darwin
+      goarch: s390x
+    - goos: windows
+      goarch: ppc64le
+    - goos: windows
+      goarch: s390x
+    - goos: windows
+      goarch: arm
+      goarm: "5"
+    - goos: windows
+      goarch: arm
+      goarm: "6"
+    - goos: windows
+      goarch: arm
+      goarm: "7"
+    - goos: windows
+      goarch: arm64
+    - goos: freebsd
+      goarch: ppc64le
+    - goos: freebsd
+      goarch: s390x
+    - goos: freebsd
+      goarch: arm
+      goarm: "5"
+    - goos: freebsd
+      goarch: arm
+      goarm: "6"
+    - goos: freebsd
+      goarch: arm
+      goarm: "7"
+    - goos: freebsd
+      goarch: arm64
+  flags:
+  - -trimpath
+  ldflags:
+  - -s -w
+  - -X main.Version={{.Version}}
+  binary: >-
+    {{ .ProjectName }}-
+    {{- if .IsSnapshot }}{{ .Branch }}-
+    {{- else }}{{- .Version }}-{{ end }}
+    {{- .Os }}-
+    {{- if eq .Arch "amd64" }}amd64
+    {{- else if eq .Arch "amd64_v1" }}amd64
+    {{- else if eq .Arch "386" }}386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- if .Arm }}-{{ .Arm }}{{ end }}
+  no_unique_dist_dir: true
 
 archives:
   - format: binary
@@ -82,42 +78,7 @@ archives:
     allow_different_binary_count: true
 
 checksum:
-  name_template: "checksums.txt"
-  extra_files:
-    - glob: ./**.xz
+  name_template: 'checksums.txt'
 
 snapshot:
   name_template: "{{ incpatch .Version }}"
-
-release:
-  # You can add extra pre-existing files to the release.
-  # The filename on the release will be the last part of the path (base).
-  # If another file with the same name exists, the last one found will be used.
-  #
-  # Templates: allowed
-  extra_files:
-    - glob: ./**.xz
-
-changelog:
-  use: github
-  groups:
-    - title: Features
-      regexp: "^.*feat[(\\w)]*:+.*$"
-      order: 0
-    - title: "Bug fixes"
-      regexp: "^.*fix[(\\w)]*:+.*$"
-      order: 1
-    - title: "Enhancements"
-      regexp: "^.*chore[(\\w)]*:+.*$"
-      order: 2
-    - title: "Refactor"
-      regexp: "^.*refactor[(\\w)]*:+.*$"
-      order: 3
-    - title: "Build process updates"
-      regexp: ^.*?(build|ci)(\(.+\))??!?:.+$
-      order: 4
-    - title: "Documentation updates"
-      regexp: ^.*?docs?(\(.+\))??!?:.+$
-      order: 4
-    - title: Others
-      order: 999

.hadolint.yaml

@@ -1,3 +0,0 @@
-ignored:
-  - DL3018
-  - DL3008

Makefile

@@ -1,8 +1,19 @@
+DIST := dist
 EXECUTABLE := drone-scp
-GOFMT ?= gofumpt -l -s -w
+GOFMT ?= gofumpt -l
+DIST := dist
+DIST_DIRS := $(DIST)/binaries $(DIST)/release
 GO ?= go
+SHASUM ?= shasum -a 256
 GOFILES := $(shell find . -name "*.go" -type f)
 HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
+XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
+XGO_VERSION := go-1.19.x
+GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11
+
+LINUX_ARCHS ?= linux/amd64,linux/arm64
+DARWIN_ARCHS ?= darwin-10.12/amd64,darwin-10.12/arm64
+WINDOWS_ARCHS ?= windows/*
 
 ifneq ($(shell uname), Darwin)
 	EXTLDFLAGS = -extldflags "-static" $(null)
@@ -70,7 +81,7 @@ install: $(GOFILES)
 build: $(EXECUTABLE)
 
 $(EXECUTABLE): $(GOFILES)
-	$(GO) build -v -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o bin/$@
+	$(GO) build -v -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o $@
 
 build_linux_amd64:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -a -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o release/linux/amd64/$(DEPLOY_IMAGE)
@@ -97,13 +108,56 @@ ssh-server:
 	rm -rf /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_dsa_key
 	sed -i 's/^#PubkeyAuthentication yes/PubkeyAuthentication yes/g' /etc/ssh/sshd_config
 	sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/g' /etc/ssh/sshd_config
-	sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/g' /etc/ssh/sshd_config
-	sed -i 's/^#ListenAddress ::/ListenAddress ::/g' /etc/ssh/sshd_config
 	./tests/entrypoint.sh /usr/sbin/sshd -D &
 
 coverage:
 	sed -i '/main.go/d' coverage.txt
 
+.PHONY: deps-backend
+deps-backend:
+	$(GO) mod download
+	$(GO) install $(GXZ_PAGAGE)
+	$(GO) install $(XGO_PACKAGE)
+
+.PHONY: release
+release: release-linux release-darwin release-windows release-copy release-compress release-check
+
+$(DIST_DIRS):
+	mkdir -p $(DIST_DIRS)
+
+.PHONY: release-windows
+release-windows: | $(DIST_DIRS)
+	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(WINDOWS_ARCHS)' -out $(EXECUTABLE)-$(VERSION) .
+ifeq ($(CI),true)
+	cp -r /build/* $(DIST)/binaries/
+endif
+
+.PHONY: release-linux
+release-linux: | $(DIST_DIRS)
+	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(LINUX_ARCHS)' -out $(EXECUTABLE)-$(VERSION) .
+ifeq ($(CI),true)
+	cp -r /build/* $(DIST)/binaries/
+endif
+
+.PHONY: release-darwin
+release-darwin: | $(DIST_DIRS)
+	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets '$(DARWIN_ARCHS)' -out $(EXECUTABLE)-$(VERSION) .
+ifeq ($(CI),true)
+	cp -r /build/* $(DIST)/binaries/
+endif
+
+.PHONY: release-copy
+release-copy: | $(DIST_DIRS)
+	cd $(DIST); for file in `find . -type f -name "*"`; do cp $${file} ./release/; done;
+
+.PHONY: release-check
+release-check: | $(DIST_DIRS)
+	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "checksumming $${file}" && $(SHASUM) `echo $${file} | sed 's/^..//'` > $${file}.sha256; done;
+
+.PHONY: release-compress
+release-compress: | $(DIST_DIRS)
+	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && $(GO) run $(GXZ_PAGAGE) -k -9 $${file}; done;
+
 clean:
 	$(GO) clean -x -i ./...
 	rm -rf coverage.txt $(EXECUTABLE) $(DIST)

command.go

@@ -1,29 +1,22 @@
 package main
 
-// This function returns the appropriate command for removing a file/directory based on the operating system.
 func rmcmd(os, target string) string {
 	switch os {
 	case "windows":
-		// On Windows, use DEL command to delete files and folders recursively
 		return "DEL /F /S " + target
 	case "unix":
-		// On Unix-based systems, use rm command to delete files and folders recursively
 		return "rm -rf " + target
 	}
-	// Return an empty string if the operating system is not recognized
 	return ""
 }
 
-// This function returns the appropriate command for creating a directory based on the operating system.
 func mkdircmd(os, target string) string {
 	switch os {
 	case "windows":
-		// On Windows, use mkdir command to create directory and check if it exists
 		return "if not exist " + target + " mkdir " + target
 	case "unix":
-		// On Unix-based systems, use mkdir command with -p option to create directories recursively
 		return "mkdir -p " + target
 	}
-	// Return an empty string if the operating system is not recognized
+
 	return ""
 }

command_test.go

@@ -1,42 +0,0 @@
-package main
-
-import "testing"
-
-// Unit tests for rmcmd and mkdircmd
-func TestCommands(t *testing.T) {
-	// Test rmcmd on Windows
-	os1 := "windows"
-	target1 := "C:\\path\\to\\file"
-	expected1 := "DEL /F /S " + target1
-	actual1 := rmcmd(os1, target1)
-	if actual1 != expected1 {
-		t.Errorf("rmcmd(%s, %s) = %s; expected %s", os1, target1, actual1, expected1)
-	}
-
-	// Test rmcmd on Unix-based system
-	os2 := "unix"
-	target2 := "/path/to/folder"
-	expected2 := "rm -rf " + target2
-	actual2 := rmcmd(os2, target2)
-	if actual2 != expected2 {
-		t.Errorf("rmcmd(%s, %s) = %s; expected %s", os2, target2, actual2, expected2)
-	}
-
-	// Test mkdircmd on Windows
-	os3 := "windows"
-	target3 := "C:\\path\\to\\folder"
-	expected3 := "if not exist " + target3 + " mkdir " + target3
-	actual3 := mkdircmd(os3, target3)
-	if actual3 != expected3 {
-		t.Errorf("mkdircmd(%s, %s) = %s; expected %s", os3, target3, actual3, expected3)
-	}
-
-	// Test mkdircmd on Unix-based system
-	os4 := "unix"
-	target4 := "/path/to/folder"
-	expected4 := "mkdir -p " + target4
-	actual4 := mkdircmd(os4, target4)
-	if actual4 != expected4 {
-		t.Errorf("mkdircmd(%s, %s) = %s; expected %s", os4, target4, actual4, expected4)
-	}
-}

docker/Dockerfile

@@ -3,32 +3,18 @@ FROM alpine:3.17
 ARG TARGETOS
 ARG TARGETARCH
 
-LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>"
+LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>" \
+  org.label-schema.name="SCP Plugin" \
+  org.label-schema.vendor="Bo-Yi Wu" \
+  org.label-schema.schema-version="1.0"
 
 LABEL org.opencontainers.image.source=https://github.com/appleboy/drone-scp
 LABEL org.opencontainers.image.description="Copy files and artifacts via SSH"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --no-cache ca-certificates && \
+RUN apk add --no-cache ca-certificates=20220614-r4 && \
   rm -rf /var/cache/apk/*
 
-RUN addgroup \
-  -S -g 1000 \
-  deploy && \
-  adduser \
-  -S -H -D \
-  -h /home/deploy \
-  -s /bin/sh \
-  -u 1000 \
-  -G deploy \
-  deploy
-
-RUN mkdir -p /home/deploy && \
-  chown deploy:deploy /home/deploy
-
-# deploy:deploy
-USER 1000:1000
-
 COPY release/${TARGETOS}/${TARGETARCH}/drone-scp /bin/
 
 ENTRYPOINT ["/bin/drone-scp"]

go.mod

@@ -1,27 +1,27 @@
 module github.com/appleboy/drone-scp
 
-go 1.22
+go 1.20
 
 require (
-	github.com/appleboy/com v0.2.0
-	github.com/appleboy/easyssh-proxy v1.5.0
-	github.com/fatih/color v1.18.0
+	github.com/appleboy/com v0.1.7
+	github.com/appleboy/easyssh-proxy v1.3.9
+	github.com/fatih/color v1.15.0
 	github.com/joho/godotenv v1.5.1
-	github.com/stretchr/testify v1.8.4
-	github.com/urfave/cli/v2 v2.27.5
-	golang.org/x/crypto v0.28.0
+	github.com/stretchr/testify v1.8.2
+	github.com/urfave/cli/v2 v2.25.1
+	golang.org/x/crypto v0.8.0
 )
 
 require (
 	github.com/ScaleFT/sshkeys v1.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	golang.org/x/sys v0.7.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,54 +1,63 @@
+github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
 github.com/ScaleFT/sshkeys v1.2.0 h1:5BRp6rTVIhJzXT3VcUQrKgXR8zWA3sOsNeuyW15WUA8=
 github.com/ScaleFT/sshkeys v1.2.0/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
-github.com/appleboy/com v0.2.0 h1:0sggtDLRzh9eP8wATOTvbYzjulufRI+vuLbxJilgyHI=
-github.com/appleboy/com v0.2.0/go.mod h1:xlUTmT+fAy+HeLWdWX/saBEMbmkQzaVAqB1xC70Oys4=
-github.com/appleboy/easyssh-proxy v1.5.0 h1:OYdSPvYQN3mhnsMH5I2OF1TgwSEcSq33kvjQfTwvZww=
-github.com/appleboy/easyssh-proxy v1.5.0/go.mod h1:zcEMrStH91/tcUn3gUGP0KpQwUYLm8tX/Ook1AH98uc=
-github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
-github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/appleboy/com v0.1.7 h1:4lYTFNoMAAXGGIC8lDxVg/NY+1aXbYqfAWN05cZhd0M=
+github.com/appleboy/com v0.1.7/go.mod h1:JUK+oH0SXCLRH57pDMJx6VWVsm8CPdajalmRSWwamBE=
+github.com/appleboy/easyssh-proxy v1.3.9 h1:b+sVSTz+cVFvfA23HQywMMpm0s5g3gH7jYdBcQqaCQI=
+github.com/appleboy/easyssh-proxy v1.3.9/go.mod h1:G1eQomBEME7NWKA3hE49s5HsT44S5fn0aBxX7k9Yjug=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFnmy/yg3qDTft4rE5DY2uJ/cCxCe3q0XTU=
 github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
-github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
-github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
-github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/urfave/cli/v2 v2.25.1 h1:zw8dSP7ghX0Gmm8vugrs6q9Ku0wzweqPyshy+syu9Gw=
+github.com/urfave/cli/v2 v2.25.1/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"log"
 	"os"
-	"strconv"
 	"time"
 
 	"github.com/appleboy/easyssh-proxy"
@@ -22,14 +21,10 @@ func main() {
 		_ = godotenv.Load(filename)
 	}
 
-	if _, err := os.Stat("/run/drone/env"); err == nil {
-		_ = godotenv.Overload("/run/drone/env")
-	}
-
 	app := cli.NewApp()
 	app.Name = "Drone SCP"
 	app.Usage = "Copy files and artifacts via SSH."
-	app.Copyright = "Copyright (c) " + strconv.Itoa(time.Now().Year()) + " Bo-Yi Wu"
+	app.Copyright = "Copyright (c) 2020 Bo-Yi Wu"
 	app.Version = Version
 	app.Authors = []*cli.Author{
 		{
@@ -43,72 +38,49 @@ func main() {
 		&cli.StringSliceFlag{
 			Name:     "host",
 			Aliases:  []string{"H"},
-			Usage:    "connect to host",
-			EnvVars:  []string{"PLUGIN_HOST", "SSH_HOST", "INPUT_HOST"},
+			Usage:    "Server host",
+			EnvVars:  []string{"PLUGIN_HOST", "SCP_HOST", "SSH_HOST", "HOST", "INPUT_HOST"},
 			FilePath: ".host",
 		},
-		&cli.IntFlag{
-			Name:    "port",
-			Aliases: []string{"p"},
-			Usage:   "connect to port",
-			EnvVars: []string{"PLUGIN_PORT", "SSH_PORT", "INPUT_PORT"},
-			Value:   22,
-		},
 		&cli.StringFlag{
-			Name:    "protocol",
-			Usage:   "The IP protocol to use. Valid values are \"tcp\". \"tcp4\" or \"tcp6\". Default to tcp.",
-			EnvVars: []string{"PLUGIN_PROTOCOL", "SSH_PROTOCOL", "INPUT_PROTOCOL"},
-			Value:   "tcp",
+			Name:    "port",
+			Aliases: []string{"P"},
+			Value:   "22",
+			Usage:   "Server port, default to 22",
+			EnvVars: []string{"PLUGIN_PORT", "SCP_PORT", "SSH_PORT", "PORT", "INPUT_PORT"},
 		},
 		&cli.StringFlag{
 			Name:    "username",
-			Aliases: []string{"user", "u"},
-			Usage:   "connect as user",
-			EnvVars: []string{"PLUGIN_USERNAME", "PLUGIN_USER", "SSH_USERNAME", "INPUT_USERNAME"},
-			Value:   "root",
+			Aliases: []string{"u"},
+			Usage:   "Server username",
+			EnvVars: []string{"PLUGIN_USERNAME", "PLUGIN_USER", "SCP_USERNAME", "SSH_USERNAME", "USERNAME", "INPUT_USERNAME"},
 		},
 		&cli.StringFlag{
 			Name:    "password",
-			Aliases: []string{"P"},
-			Usage:   "user password",
-			EnvVars: []string{"PLUGIN_PASSWORD", "SSH_PASSWORD", "INPUT_PASSWORD"},
-		},
-		&cli.DurationFlag{
-			Name:    "timeout",
-			Usage:   "connection timeout",
-			EnvVars: []string{"PLUGIN_TIMEOUT", "SSH_TIMEOUT", "INPUT_TIMEOUT"},
-			Value:   30 * time.Second,
-		},
-		&cli.StringFlag{
-			Name:    "ssh-key",
-			Usage:   "private ssh key",
-			EnvVars: []string{"PLUGIN_SSH_KEY", "PLUGIN_KEY", "SSH_KEY", "INPUT_KEY"},
-		},
-		&cli.StringFlag{
-			Name:    "ssh-passphrase",
-			Usage:   "The purpose of the passphrase is usually to encrypt the private key.",
-			EnvVars: []string{"PLUGIN_SSH_PASSPHRASE", "PLUGIN_PASSPHRASE", "SSH_PASSPHRASE", "INPUT_PASSPHRASE"},
-		},
-		&cli.StringFlag{
-			Name:    "key-path",
-			Aliases: []string{"i"},
-			Usage:   "ssh private key path",
-			EnvVars: []string{"PLUGIN_KEY_PATH", "SSH_KEY_PATH", "INPUT_KEY_PATH"},
+			Aliases: []string{"p"},
+			Usage:   "Password for password-based authentication",
+			EnvVars: []string{"PLUGIN_PASSWORD", "SCP_PASSWORD", "SSH_PASSWORD", "PASSWORD", "INPUT_PASSWORD"},
 		},
 		&cli.StringSliceFlag{
 			Name:    "ciphers",
 			Usage:   "The allowed cipher algorithms. If unspecified then a sensible",
-			EnvVars: []string{"PLUGIN_CIPHERS", "SSH_CIPHERS", "INPUT_CIPHERS"},
+			EnvVars: []string{"PLUGIN_CIPHERS", "SSH_CIPHERS", "CIPHERS", "INPUT_CIPHERS"},
 		},
 		&cli.BoolFlag{
 			Name:    "useInsecureCipher",
 			Usage:   "include more ciphers with use_insecure_cipher",
-			EnvVars: []string{"PLUGIN_USE_INSECURE_CIPHER", "SSH_USE_INSECURE_CIPHER", "INPUT_USE_INSECURE_CIPHER"},
+			EnvVars: []string{"PLUGIN_USE_INSECURE_CIPHER", "SSH_USE_INSECURE_CIPHER", "USE_INSECURE_CIPHER", "INPUT_USE_INSECURE_CIPHER"},
 		},
 		&cli.StringFlag{
 			Name:    "fingerprint",
 			Usage:   "fingerprint SHA256 of the host public key, default is to skip verification",
-			EnvVars: []string{"PLUGIN_FINGERPRINT", "SSH_FINGERPRINT", "INPUT_FINGERPRINT"},
+			EnvVars: []string{"PLUGIN_FINGERPRINT", "SSH_FINGERPRINT", "FINGERPRINT", "INPUT_FINGERPRINT"},
+		},
+		&cli.DurationFlag{
+			Name:    "timeout",
+			Usage:   "connection timeout",
+			EnvVars: []string{"PLUGIN_TIMEOUT", "SCP_TIMEOUT", "INPUT_TIMEOUT"},
+			Value:   30 * time.Second,
 		},
 		&cli.DurationFlag{
 			Name:    "command.timeout",
@@ -116,86 +88,150 @@ func main() {
 			EnvVars: []string{"PLUGIN_COMMAND_TIMEOUT", "SSH_COMMAND_TIMEOUT", "INPUT_COMMAND_TIMEOUT"},
 			Value:   10 * time.Minute,
 		},
+		&cli.StringFlag{
+			Name:    "ssh-key",
+			Aliases: []string{"k"},
+			Usage:   "ssh private key",
+			EnvVars: []string{"PLUGIN_SSH_KEY,", "PLUGIN_KEY", "SCP_KEY", "SSH_KEY", "KEY", "INPUT_KEY"},
+		},
+		&cli.StringFlag{
+			Name:    "ssh-passphrase",
+			Usage:   "The purpose of the passphrase is usually to encrypt the private key.",
+			EnvVars: []string{"PLUGIN_SSH_PASSPHRASE", "PLUGIN_PASSPHRASE", "SSH_PASSPHRASE", "PASSPHRASE", "INPUT_PASSPHRASE"},
+		},
+		&cli.StringFlag{
+			Name:    "key-path",
+			Aliases: []string{"i"},
+			Usage:   "ssh private key path",
+			EnvVars: []string{"PLUGIN_KEY_PATH", "SCP_KEY_PATH", "SSH_KEY_PATH", "INPUT_KEY_PATH"},
+		},
 		&cli.StringSliceFlag{
 			Name:    "target",
 			Aliases: []string{"t"},
 			Usage:   "Target path on the server",
-			EnvVars: []string{"PLUGIN_TARGET", "SSH_TARGET", "INPUT_TARGET"},
+			EnvVars: []string{"PLUGIN_TARGET", "SCP_TARGET", "TARGET", "INPUT_TARGET"},
 		},
 		&cli.StringSliceFlag{
 			Name:    "source",
 			Aliases: []string{"s"},
 			Usage:   "scp file list",
-			EnvVars: []string{"PLUGIN_SOURCE", "SCP_SOURCE", "INPUT_SOURCE"},
+			EnvVars: []string{"PLUGIN_SOURCE", "SCP_SOURCE", "SOURCE", "INPUT_SOURCE"},
 		},
 		&cli.BoolFlag{
 			Name:    "rm",
 			Aliases: []string{"r"},
 			Usage:   "remove target folder before upload data",
-			EnvVars: []string{"PLUGIN_RM", "SCP_RM", "INPUT_RM"},
+			EnvVars: []string{"PLUGIN_RM", "SCP_RM", "RM", "INPUT_RM"},
 		},
 		&cli.StringFlag{
-			Name:    "proxy.host",
-			Usage:   "connect to host of proxy",
-			EnvVars: []string{"PLUGIN_PROXY_HOST", "PROXY_SSH_HOST", "INPUT_PROXY_HOST"},
+			Name:    "repo.owner",
+			Usage:   "repository owner",
+			EnvVars: []string{"DRONE_REPO_OWNER"},
 		},
 		&cli.StringFlag{
-			Name:    "proxy.port",
-			Usage:   "connect to port of proxy",
-			EnvVars: []string{"PLUGIN_PROXY_PORT", "PROXY_SSH_PORT", "INPUT_PROXY_PORT"},
-			Value:   "22",
+			Name:    "repo.name",
+			Usage:   "repository name",
+			EnvVars: []string{"DRONE_REPO_NAME"},
 		},
 		&cli.StringFlag{
-			Name:    "proxy.protocol",
-			Usage:   "The IP protocol to use for the proxy. Valid values are \"tcp\". \"tcp4\" or \"tcp6\". Default to tcp.",
-			EnvVars: []string{"PLUGIN_PROXY_PROTOCOL", "SSH_PROXY_PROTOCOL", "INPUT_PROXY_PROTOCOL"},
-			Value:   "tcp",
+			Name:    "commit.sha",
+			Usage:   "git commit sha",
+			EnvVars: []string{"DRONE_COMMIT_SHA"},
 		},
 		&cli.StringFlag{
-			Name:    "proxy.username",
-			Usage:   "connect as user of proxy",
-			EnvVars: []string{"PLUGIN_PROXY_USERNAME", "PLUGIN_PROXY_USER", "PROXY_SSH_USERNAME", "INPUT_PROXY_USERNAME"},
-			Value:   "root",
+			Name:    "commit.branch",
+			Value:   "master",
+			Usage:   "git commit branch",
+			EnvVars: []string{"DRONE_COMMIT_BRANCH"},
 		},
 		&cli.StringFlag{
-			Name:    "proxy.password",
-			Usage:   "user password of proxy",
-			EnvVars: []string{"PLUGIN_PROXY_PASSWORD", "PROXY_SSH_PASSWORD", "INPUT_PROXY_PASSWORD"},
+			Name:    "commit.author",
+			Usage:   "git author name",
+			EnvVars: []string{"DRONE_COMMIT_AUTHOR"},
+		},
+		&cli.StringFlag{
+			Name:    "commit.message",
+			Usage:   "commit message",
+			EnvVars: []string{"DRONE_COMMIT_MESSAGE"},
+		},
+		&cli.StringFlag{
+			Name:    "build.event",
+			Value:   "push",
+			Usage:   "build event",
+			EnvVars: []string{"DRONE_BUILD_EVENT"},
+		},
+		&cli.IntFlag{
+			Name:    "build.number",
+			Usage:   "build number",
+			EnvVars: []string{"DRONE_BUILD_NUMBER"},
+		},
+		&cli.StringFlag{
+			Name:    "build.status",
+			Usage:   "build status",
+			Value:   "success",
+			EnvVars: []string{"DRONE_BUILD_STATUS"},
+		},
+		&cli.StringFlag{
+			Name:    "build.link",
+			Usage:   "build link",
+			EnvVars: []string{"DRONE_BUILD_LINK"},
 		},
 		&cli.StringFlag{
 			Name:    "proxy.ssh-key",
 			Usage:   "private ssh key of proxy",
-			EnvVars: []string{"PLUGIN_PROXY_SSH_KEY", "PLUGIN_PROXY_KEY", "PROXY_SSH_KEY", "INPUT_PROXY_KEY"},
+			EnvVars: []string{"PLUGIN_PROXY_SSH_KEY", "PLUGIN_PROXY_KEY", "PROXY_SSH_KEY", "PROXY_KEY", "INPUT_PROXY_KEY"},
 		},
 		&cli.StringFlag{
 			Name:    "proxy.ssh-passphrase",
 			Usage:   "The purpose of the passphrase is usually to encrypt the private key.",
-			EnvVars: []string{"PLUGIN_PROXY_SSH_PASSPHRASE", "PLUGIN_PROXY_PASSPHRASE", "PROXY_SSH_PASSPHRASE", "INPUT_PROXY_PASSPHRASE"},
+			EnvVars: []string{"PLUGIN_PROXY_SSH_PASSPHRASE", "PLUGIN_PROXY_PASSPHRASE", "PROXY_SSH_PASSPHRASE", "PROXY_PASSPHRASE", "INPUT_PROXY_PASSPHRASE"},
 		},
 		&cli.StringFlag{
 			Name:    "proxy.key-path",
 			Usage:   "ssh private key path of proxy",
 			EnvVars: []string{"PLUGIN_PROXY_KEY_PATH", "PROXY_SSH_KEY_PATH", "INPUT_PROXY_KEY_PATH"},
 		},
-		&cli.DurationFlag{
-			Name:    "proxy.timeout",
-			Usage:   "proxy connection timeout",
-			EnvVars: []string{"PLUGIN_PROXY_TIMEOUT", "PROXY_SSH_TIMEOUT", "INPUT_PROXY_TIMEOUT"},
+		&cli.StringFlag{
+			Name:    "proxy.username",
+			Usage:   "connect as user of proxy",
+			EnvVars: []string{"PLUGIN_PROXY_USERNAME", "PLUGIN_PROXY_USER", "PROXY_SSH_USERNAME", "PROXY_USERNAME", "INPUT_PROXY_USERNAME"},
+			Value:   "root",
+		},
+		&cli.StringFlag{
+			Name:    "proxy.password",
+			Usage:   "user password of proxy",
+			EnvVars: []string{"PLUGIN_PROXY_PASSWORD", "PROXY_SSH_PASSWORD", "PROXY_PASSWORD", "INPUT_PROXY_PASSWORD"},
+		},
+		&cli.StringFlag{
+			Name:    "proxy.host",
+			Usage:   "connect to host of proxy",
+			EnvVars: []string{"PLUGIN_PROXY_HOST", "PROXY_SSH_HOST", "PROXY_HOST", "INPUT_PROXY_HOST"},
 		},
 		&cli.StringSliceFlag{
 			Name:    "proxy.ciphers",
 			Usage:   "The allowed cipher algorithms. If unspecified then a sensible",
-			EnvVars: []string{"PLUGIN_PROXY_CIPHERS", "PROXY_SSH_CIPHERS", "INPUT_PROXY_CIPHERS"},
+			EnvVars: []string{"PLUGIN_PROXY_CIPHERS", "PROXY_SSH_CIPHERS", "PROXY_CIPHERS", "INPUT_PROXY_CIPHERS"},
 		},
 		&cli.BoolFlag{
 			Name:    "proxy.useInsecureCipher",
 			Usage:   "include more ciphers with use_insecure_cipher",
-			EnvVars: []string{"PLUGIN_PROXY_USE_INSECURE_CIPHER", "PROXY_SSH_USE_INSECURE_CIPHER", "INPUT_PROXY_USE_INSECURE_CIPHER"},
+			EnvVars: []string{"PLUGIN_PROXY_USE_INSECURE_CIPHER", "SSH_PROXY_USE_INSECURE_CIPHER", "PROXY_USE_INSECURE_CIPHER", "INPUT_PROXY_USE_INSECURE_CIPHER"},
 		},
 		&cli.StringFlag{
 			Name:    "proxy.fingerprint",
 			Usage:   "fingerprint SHA256 of the host public key, default is to skip verification",
-			EnvVars: []string{"PLUGIN_PROXY_FINGERPRINT", "PROXY_SSH_FINGERPRINT", "PROXY_FINGERPRINT", "INPUT_PROXY_FINGERPRINT"},
+			EnvVars: []string{"PLUGIN_PROXY_FINGERPRINT", "SSH_PROXY_FINGERPRINT", "PROXY_FINGERPRINT", "INPUT_PROXY_FINGERPRINT"},
+		},
+		&cli.StringFlag{
+			Name:    "proxy.port",
+			Usage:   "connect to port of proxy",
+			EnvVars: []string{"PLUGIN_PROXY_PORT", "PROXY_SSH_PORT", "PROXY_PORT", "INPUT_PROXY_PORT"},
+			Value:   "22",
+		},
+		&cli.DurationFlag{
+			Name:    "proxy.timeout",
+			Usage:   "proxy connection timeout",
+			EnvVars: []string{"PLUGIN_PROXY_TIMEOUT", "PROXY_SSH_TIMEOUT", "INPUT_PROXY_TIMEOUT"},
 		},
 		&cli.IntFlag{
 			Name:    "strip.components",
@@ -205,33 +241,28 @@ func main() {
 		&cli.StringFlag{
 			Name:    "tar.exec",
 			Usage:   "Alternative `tar` executable to on the dest host",
-			EnvVars: []string{"PLUGIN_TAR_EXEC", "SSH_TAR_EXEC", "INPUT_TAR_EXEC"},
+			EnvVars: []string{"PLUGIN_TAR_EXEC", "SCP_TAR_EXEC", "INPUT_TAR_EXEC"},
 			Value:   "tar",
 		},
 		&cli.StringFlag{
 			Name:    "tar.tmp-path",
 			Usage:   "Temporary path for tar file on the dest host",
-			EnvVars: []string{"PLUGIN_TAR_TMP_PATH", "SSH_TAR_TMP_PATH", "INPUT_TAR_TMP_PATH"},
+			EnvVars: []string{"PLUGIN_TAR_TMP_PATH", "SCP_TAR_TMP_PATH"},
 		},
 		&cli.BoolFlag{
 			Name:    "debug",
 			Usage:   "remove target folder before upload data",
-			EnvVars: []string{"PLUGIN_DEBUG", "INPUT_DEBUG"},
+			EnvVars: []string{"PLUGIN_DEBUG", "DEBUG", "INPUT_DEBUG"},
 		},
 		&cli.BoolFlag{
 			Name:    "overwrite",
 			Usage:   "use --overwrite flag with tar",
-			EnvVars: []string{"PLUGIN_OVERWRITE", "INPUT_OVERWRITE"},
+			EnvVars: []string{"PLUGIN_OVERWRITE", "SCP_OVERWRITE", "INPUT_OVERWRITE"},
 		},
 		&cli.BoolFlag{
 			Name:    "unlink.first",
 			Usage:   "use --unlink-first flag with tar",
-			EnvVars: []string{"PLUGIN_UNLINK_FIRST", "INPUT_UNLINK_FIRST"},
-		},
-		&cli.BoolFlag{
-			Name:    "tar.dereference",
-			Usage:   "use --dereference flag with tar",
-			EnvVars: []string{"PLUGIN_TAR_DEREFERENCE", "INPUT_TAR_DEREFERENCE"},
+			EnvVars: []string{"PLUGIN_UNLINK_FIRST", "SCP_UNLINK_FIRST", "INPUT_UNLINK_FIRST"},
 		},
 	}
 
@@ -275,10 +306,23 @@ REPOSITORY:
 
 func run(c *cli.Context) error {
 	plugin := Plugin{
+		Repo: Repo{
+			Owner: c.String("repo.owner"),
+			Name:  c.String("repo.name"),
+		},
+		Build: Build{
+			Number:  c.Int("build.number"),
+			Event:   c.String("build.event"),
+			Status:  c.String("build.status"),
+			Commit:  c.String("commit.sha"),
+			Branch:  c.String("commit.branch"),
+			Author:  c.String("commit.author"),
+			Message: c.String("commit.message"),
+			Link:    c.String("build.link"),
+		},
 		Config: Config{
 			Host:              c.StringSlice("host"),
-			Port:              c.Int("port"),
-			Protocol:          easyssh.Protocol(c.String("protocol")),
+			Port:              c.String("port"),
 			Username:          c.String("username"),
 			Password:          c.String("password"),
 			Passphrase:        c.String("ssh-passphrase"),
@@ -298,7 +342,6 @@ func run(c *cli.Context) error {
 			UnlinkFirst:       c.Bool("unlink.first"),
 			Ciphers:           c.StringSlice("ciphers"),
 			UseInsecureCipher: c.Bool("useInsecureCipher"),
-			TarDereference:    c.Bool("tar.dereference"),
 			Proxy: easyssh.DefaultConfig{
 				Key:               c.String("proxy.ssh-key"),
 				Passphrase:        c.String("proxy.ssh-passphrase"),
@@ -308,7 +351,6 @@ func run(c *cli.Context) error {
 				Password:          c.String("proxy.password"),
 				Server:            c.String("proxy.host"),
 				Port:              c.String("proxy.port"),
-				Protocol:          easyssh.Protocol(c.String("proxy.protocol")),
 				Timeout:           c.Duration("proxy.timeout"),
 				Ciphers:           c.StringSlice("proxy.ciphers"),
 				UseInsecureCipher: c.Bool("proxy.useInsecureCipher"),

plugin.go

@@ -19,15 +19,33 @@ import (
 var (
 	errMissingHost           = errors.New("Error: missing server host")
 	errMissingPasswordOrKey  = errors.New("Error: can't connect without a private SSH key or password")
+	errSetPasswordandKey     = errors.New("can't set password and key at the same time")
 	errMissingSourceOrTarget = errors.New("missing source or target config")
 )
 
 type (
+	// Repo information.
+	Repo struct {
+		Owner string
+		Name  string
+	}
+
+	// Build information.
+	Build struct {
+		Event   string
+		Number  int
+		Commit  string
+		Message string
+		Branch  string
+		Author  string
+		Status  string
+		Link    string
+	}
+
 	// Config for the plugin.
 	Config struct {
 		Host              []string
-		Port              int
-		Protocol          easyssh.Protocol
+		Port              string
 		Username          string
 		Password          string
 		Key               string
@@ -48,11 +66,12 @@ type (
 		UnlinkFirst       bool
 		Ciphers           []string
 		UseInsecureCipher bool
-		TarDereference    bool
 	}
 
 	// Plugin values.
 	Plugin struct {
+		Repo     Repo
+		Build    Build
 		Config   Config
 		DestFile string
 	}
@@ -72,7 +91,7 @@ func globList(paths []string) fileList {
 
 	for _, pattern := range paths {
 		ignore := false
-		pattern = strings.TrimSpace(pattern)
+		pattern = strings.Trim(pattern, " ")
 		if string(pattern[0]) == "!" {
 			pattern = pattern[1:]
 			ignore = true
@@ -93,6 +112,21 @@ func globList(paths []string) fileList {
 	return list
 }
 
+func buildArgs(tar string, files fileList) []string {
+	args := []string{}
+	if len(files.Ignore) > 0 {
+		for _, v := range files.Ignore {
+			args = append(args, "--exclude")
+			args = append(args, v)
+		}
+	}
+	args = append(args, "-zcf")
+	args = append(args, getRealPath(tar))
+	args = append(args, files.Source...)
+
+	return args
+}
+
 func (p Plugin) log(host string, message ...interface{}) {
 	if count := len(p.Config.Host); count == 1 {
 		fmt.Printf("%s", fmt.Sprintln(message...))
@@ -116,14 +150,12 @@ func (p *Plugin) removeDestFile(os string, ssh *easyssh.MakeConfig) error {
 }
 
 func (p *Plugin) removeAllDestFile() error {
-	for _, h := range trimValues(p.Config.Host) {
-		host, port := p.hostPort(h)
+	for _, host := range trimValues(p.Config.Host) {
 		ssh := &easyssh.MakeConfig{
 			Server:            host,
 			User:              p.Config.Username,
 			Password:          p.Config.Password,
-			Port:              port,
-			Protocol:          p.Config.Protocol,
+			Port:              p.Config.Port,
 			Key:               p.Config.Key,
 			KeyPath:           p.Config.KeyPath,
 			Passphrase:        p.Config.Passphrase,
@@ -136,7 +168,6 @@ func (p *Plugin) removeAllDestFile() error {
 				User:              p.Config.Proxy.User,
 				Password:          p.Config.Proxy.Password,
 				Port:              p.Config.Proxy.Port,
-				Protocol:          p.Config.Proxy.Protocol,
 				Key:               p.Config.Proxy.Key,
 				KeyPath:           p.Config.Proxy.KeyPath,
 				Passphrase:        p.Config.Proxy.Passphrase,
@@ -153,6 +184,11 @@ func (p *Plugin) removeAllDestFile() error {
 			systemType = "windows"
 		}
 
+		_, _, _, err = ssh.Run("uname", p.Config.CommandTimeout)
+		if err == nil {
+			systemType = "unix"
+		}
+
 		// remove tar file
 		err = p.removeDestFile(systemType, ssh)
 		if err != nil {
@@ -168,33 +204,12 @@ type fileList struct {
 	Source []string
 }
 
-func (p *Plugin) buildTarArgs(src string) []string {
-	files := globList(trimValues(p.Config.Source))
-	args := []string{}
-	if len(files.Ignore) > 0 {
-		for _, v := range files.Ignore {
-			args = append(args, "--exclude")
-			args = append(args, v)
-		}
-	}
-
-	if p.Config.TarDereference {
-		args = append(args, "--dereference")
-	}
-
-	args = append(args, "-zcf")
-	args = append(args, getRealPath(src))
-	args = append(args, files.Source...)
-
-	return args
-}
-
-func (p *Plugin) buildUnTarArgs(target string) []string {
+func (p *Plugin) buildArgs(target string) []string {
 	args := []string{}
 
 	args = append(args,
 		p.Config.TarExec,
-		"-zxf",
+		"-xf",
 		p.DestFile,
 	)
 
@@ -221,30 +236,33 @@ func (p *Plugin) buildUnTarArgs(target string) []string {
 
 // Exec executes the plugin.
 func (p *Plugin) Exec() error {
+	hosts := trimValues(p.Config.Host)
+	if len(hosts) == 0 {
+		return errMissingHost
+	}
+
 	if len(p.Config.Key) == 0 && len(p.Config.Password) == 0 && len(p.Config.KeyPath) == 0 {
 		return errMissingPasswordOrKey
 	}
 
+	if len(p.Config.Key) != 0 && len(p.Config.Password) != 0 {
+		return errSetPasswordandKey
+	}
+
 	if len(p.Config.Source) == 0 || len(p.Config.Target) == 0 {
 		return errMissingSourceOrTarget
 	}
 
-	hosts := trimValues(p.Config.Host)
-	if len(hosts) == 0 {
-		return errMissingHost
-	}
-
+	files := globList(trimValues(p.Config.Source))
 	p.DestFile = fmt.Sprintf("%s.tar.gz", random.String(10))
 
 	// create a temporary file for the archive
 	dir := os.TempDir()
-	src := filepath.Join(dir, p.DestFile)
+	tar := filepath.Join(dir, p.DestFile)
 
-	// show current version
-	fmt.Println("drone-scp version: " + Version)
 	// run archive command
-	fmt.Println("tar all files into " + src)
-	args := p.buildTarArgs(src)
+	fmt.Println("tar all files into " + tar)
+	args := buildArgs(tar, files)
 	cmd := exec.Command(p.Config.TarExec, args...)
 	if p.Config.Debug {
 		fmt.Println("$", strings.Join(cmd.Args, " "))
@@ -260,15 +278,14 @@ func (p *Plugin) Exec() error {
 	errChannel := make(chan error)
 	finished := make(chan struct{})
 	for _, host := range hosts {
-		go func(h string) {
+		go func(host string) {
 			defer wg.Done()
-			host, port := p.hostPort(h)
 			// Create MakeConfig instance with remote username, server address and path to private key.
 			ssh := &easyssh.MakeConfig{
 				Server:            host,
 				User:              p.Config.Username,
 				Password:          p.Config.Password,
-				Port:              port,
+				Port:              p.Config.Port,
 				Key:               p.Config.Key,
 				KeyPath:           p.Config.KeyPath,
 				Passphrase:        p.Config.Passphrase,
@@ -291,26 +308,29 @@ func (p *Plugin) Exec() error {
 				},
 			}
 
-			systemType := "unix"
 			_, _, _, err := ssh.Run("ver", p.Config.CommandTimeout)
+			systemType := "unix"
 			if err == nil {
 				systemType = "windows"
 			}
 
+			_, _, _, err = ssh.Run("uname", p.Config.CommandTimeout)
+			if err == nil {
+				systemType = "unix"
+			}
+
 			// upload file to the tmp path
 			p.DestFile = fmt.Sprintf("%s%s", p.Config.TarTmpPath, p.DestFile)
 
-			p.log(host, "remote server os type is "+systemType)
 			// Call Scp method with file you want to upload to remote server.
 			p.log(host, "scp file to server.")
-			err = ssh.Scp(src, p.DestFile)
+			err = ssh.Scp(tar, p.DestFile)
 			if err != nil {
 				errChannel <- copyError{host, err.Error()}
 				return
 			}
 
 			for _, target := range p.Config.Target {
-				target = strings.Replace(target, " ", "\\ ", -1)
 				// remove target folder before upload data
 				if p.Config.Remove {
 					p.log(host, "Remove target folder:", target)
@@ -330,13 +350,13 @@ func (p *Plugin) Exec() error {
 				}
 
 				if len(errStr) != 0 {
-					errChannel <- fmt.Errorf("%s", errStr)
+					errChannel <- fmt.Errorf(errStr)
 					return
 				}
 
 				// untar file
 				p.log(host, "untar file", p.DestFile)
-				commamd := strings.Join(p.buildUnTarArgs(target), " ")
+				commamd := strings.Join(p.buildArgs(target), " ")
 				if p.Config.Debug {
 					fmt.Println("$", commamd)
 				}
@@ -393,19 +413,6 @@ func (p *Plugin) Exec() error {
 	return nil
 }
 
-func (p Plugin) hostPort(host string) (string, string) {
-	hosts := strings.Split(host, ":")
-	port := strconv.Itoa(p.Config.Port)
-	if len(hosts) > 1 &&
-		(p.Config.Protocol == easyssh.PROTOCOL_TCP ||
-			p.Config.Protocol == easyssh.PROTOCOL_TCP4) {
-		host = hosts[0]
-		port = hosts[1]
-	}
-
-	return host, port
-}
-
 func trimValues(keys []string) []string {
 	var newKeys []string
 

plugin_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -42,7 +41,7 @@ func TestMissingSourceConfig(t *testing.T) {
 		Config: Config{
 			Host:     []string{"example.com"},
 			Username: "ubuntu",
-			Port:     443,
+			Port:     "443",
 			Password: "1234",
 		},
 	}
@@ -52,6 +51,23 @@ func TestMissingSourceConfig(t *testing.T) {
 	assert.NotNil(t, err)
 }
 
+func TestSetPasswordAndKey(t *testing.T) {
+	plugin := Plugin{
+		Config: Config{
+			Host:     []string{"example.com"},
+			Username: "ubuntu",
+			Port:     "443",
+			Password: "1234",
+			Key:      "test",
+		},
+	}
+
+	err := plugin.Exec()
+
+	assert.NotNil(t, err)
+	assert.Equal(t, errSetPasswordandKey, err)
+}
+
 func TestTrimElement(t *testing.T) {
 	var input, result []string
 
@@ -82,7 +98,7 @@ func TestSCPFileFromPublicKey(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{filepath.Join(u.HomeDir, "/test")},
@@ -132,7 +148,7 @@ func TestSCPFileFromPublicKeyWithPassphrase(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/test",
 			Passphrase:     "1234",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
@@ -165,7 +181,7 @@ func TestWrongFingerprint(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "./tests/.ssh/id_rsa",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{filepath.Join(u.HomeDir, "/test2")},
@@ -189,6 +205,7 @@ func getHostPublicKeyFile(keypath string) (ssh.PublicKey, error) {
 	}
 
 	pubkey, _, _, _, err = ssh.ParseAuthorizedKey(buf)
+
 	if err != nil {
 		return nil, err
 	}
@@ -215,7 +232,7 @@ func TestSCPFileFromPublicKeyWithFingerprint(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "./tests/.ssh/id_rsa",
 			Fingerprint:    ssh.FingerprintSHA256(hostKey),
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
@@ -254,7 +271,7 @@ func TestSCPWildcardFileList(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/global/*"},
 			Target:         []string{filepath.Join(u.HomeDir, "abc")},
@@ -286,7 +303,7 @@ func TestSCPFromProxySetting(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/global/*"},
 			Target:         []string{filepath.Join(u.HomeDir, "def")},
@@ -330,7 +347,7 @@ func TestStripComponentsFlag(t *testing.T) {
 		Config: Config{
 			Host:            []string{"localhost"},
 			Username:        "drone-scp",
-			Port:            22,
+			Port:            "22",
 			KeyPath:         "tests/.ssh/id_rsa",
 			Source:          []string{"tests/global/*"},
 			StripComponents: 2,
@@ -363,7 +380,7 @@ func TestUseInsecureCipherFlag(t *testing.T) {
 		Config: Config{
 			Host:              []string{"localhost"},
 			Username:          "drone-scp",
-			Port:              22,
+			Port:              "22",
 			KeyPath:           "tests/.ssh/id_rsa",
 			Source:            []string{"tests/global/*"},
 			StripComponents:   2,
@@ -403,7 +420,7 @@ func TestIgnoreList(t *testing.T) {
 		Config: Config{
 			Host:            []string{"localhost"},
 			Username:        "drone-scp",
-			Port:            22,
+			Port:            "22",
 			KeyPath:         "tests/.ssh/id_rsa",
 			Source:          []string{"tests/global/*", "!tests/global/c.txt", "!tests/global/e.txt"},
 			StripComponents: 2,
@@ -483,7 +500,7 @@ func TestIncorrectPassword(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			Password:       "123456",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{"/home"},
@@ -506,7 +523,7 @@ func TestNoPermissionCreateFolder(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{"/etc/test"},
@@ -555,6 +572,25 @@ func TestGlobList(t *testing.T) {
 	assert.Equal(t, expectIgnores, result.Ignore)
 }
 
+func TestBuildArgs(t *testing.T) {
+	list := fileList{
+		Source: []string{"tests/a.txt", "tests/b.txt", "tests/c.txt"},
+		Ignore: []string{"tests/a.txt", "tests/b.txt"},
+	}
+
+	result := buildArgs("test.tar.gz", list)
+	expects := []string{"--exclude", "tests/a.txt", "--exclude", "tests/b.txt", "-zcf", "test.tar.gz", "tests/a.txt", "tests/b.txt", "tests/c.txt"}
+	assert.Equal(t, expects, result)
+
+	list = fileList{
+		Source: []string{"tests/a.txt", "tests/b.txt"},
+	}
+
+	result = buildArgs("test.tar.gz", list)
+	expects = []string{"-zcf", "test.tar.gz", "tests/a.txt", "tests/b.txt"}
+	assert.Equal(t, expects, result)
+}
+
 func TestRemoveDestFile(t *testing.T) {
 	ssh := &easyssh.MakeConfig{
 		Server:  "localhost",
@@ -577,6 +613,11 @@ func TestRemoveDestFile(t *testing.T) {
 		systemType = "windows"
 	}
 
+	_, _, _, err = ssh.Run("uname", plugin.Config.CommandTimeout)
+	if err == nil {
+		systemType = "unix"
+	}
+
 	// ssh io timeout
 	err = plugin.removeDestFile(systemType, ssh)
 	assert.Error(t, err)
@@ -588,8 +629,10 @@ func TestRemoveDestFile(t *testing.T) {
 	assert.Error(t, err)
 }
 
-func TestPlugin_buildUnTarArgs(t *testing.T) {
+func TestPlugin_buildArgs(t *testing.T) {
 	type fields struct {
+		Repo     Repo
+		Build    Build
 		Config   Config
 		DestFile string
 	}
@@ -610,12 +653,12 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
 					UnlinkFirst: false,
 					TarExec:     "tar",
 				},
-				DestFile: "foo.tar.gz",
+				DestFile: "foo.tar",
 			},
 			args: args{
 				target: "foo",
 			},
-			want: []string{"tar", "-zxf", "foo.tar.gz", "-C", "foo"},
+			want: []string{"tar", "-xf", "foo.tar", "-C", "foo"},
 		},
 		{
 			name: "strip components",
@@ -626,12 +669,12 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
 					TarExec:         "tar",
 					StripComponents: 2,
 				},
-				DestFile: "foo.tar.gz",
+				DestFile: "foo.tar",
 			},
 			args: args{
 				target: "foo",
 			},
-			want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "-C", "foo"},
+			want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "-C", "foo"},
 		},
 		{
 			name: "overwrite",
@@ -642,12 +685,12 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
 					Overwrite:       true,
 					UnlinkFirst:     false,
 				},
-				DestFile: "foo.tar.gz",
+				DestFile: "foo.tar",
 			},
 			args: args{
 				target: "foo",
 			},
-			want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "-C", "foo"},
+			want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "--overwrite", "-C", "foo"},
 		},
 		{
 			name: "unlink first",
@@ -658,295 +701,30 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
 					Overwrite:       true,
 					UnlinkFirst:     true,
 				},
-				DestFile: "foo.tar.gz",
+				DestFile: "foo.tar",
 			},
 			args: args{
 				target: "foo",
 			},
-			want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "foo"},
-		},
-		{
-			name: "output folder path with space",
-			fields: fields{
-				Config: Config{
-					TarExec:         "tar",
-					StripComponents: 2,
-					Overwrite:       true,
-					UnlinkFirst:     true,
-				},
-				DestFile: "foo.tar.gz",
-			},
-			args: args{
-				target: "foo\\ bar",
-			},
-			want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "foo\\ bar"},
+			want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "foo"},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			p := &Plugin{
+				Repo:     tt.fields.Repo,
+				Build:    tt.fields.Build,
 				Config:   tt.fields.Config,
 				DestFile: tt.fields.DestFile,
 			}
-			if got := p.buildUnTarArgs(tt.args.target); !reflect.DeepEqual(got, tt.want) {
+			if got := p.buildArgs(tt.args.target); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Plugin.buildArgs() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
-func TestPlugin_buildTarArgs(t *testing.T) {
-	type fields struct {
-		Config Config
-	}
-	type args struct {
-		src string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   []string
-	}{
-		{
-			name: "default command",
-			fields: fields{
-				Config: Config{
-					TarExec: "tar",
-				},
-			},
-			args: args{
-				src: "foo.tar.gz",
-			},
-			want: []string{"-zcf", "foo.tar.gz"},
-		},
-		{
-			name: "ignore list",
-			fields: fields{
-				Config: Config{
-					TarExec: "tar",
-					Source: []string{
-						"tests/*.txt",
-						"!tests/a.txt",
-					},
-				},
-			},
-			args: args{
-				src: "foo.tar.gz",
-			},
-			want: []string{"--exclude", "tests/a.txt", "-zcf", "foo.tar.gz", "tests/a.txt", "tests/b.txt"},
-		},
-		{
-			name: "dereference flag",
-			fields: fields{
-				Config: Config{
-					TarExec:        "tar",
-					TarDereference: true,
-					Source: []string{
-						"tests/*.txt",
-						"!tests/a.txt",
-					},
-				},
-			},
-			args: args{
-				src: "foo.tar.gz",
-			},
-			want: []string{"--exclude", "tests/a.txt", "--dereference", "-zcf", "foo.tar.gz", "tests/a.txt", "tests/b.txt"},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			p := &Plugin{
-				Config: tt.fields.Config,
-			}
-			if got := p.buildTarArgs(tt.args.src); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Plugin.buildTarArgs() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestTargetFolderWithSpaces(t *testing.T) {
-	if os.Getenv("SSH_AUTH_SOCK") != "" {
-		if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
-			t.Fatalf("exec: %v", err)
-		}
-	}
-
-	u, err := user.Lookup("drone-scp")
-	if err != nil {
-		t.Fatalf("Lookup: %v", err)
-	}
-
-	plugin := Plugin{
-		Config: Config{
-			Host:            []string{"localhost"},
-			Username:        "drone-scp",
-			Port:            22,
-			KeyPath:         "tests/.ssh/id_rsa",
-			Source:          []string{"tests/global/*"},
-			StripComponents: 2,
-			Target:          []string{filepath.Join(u.HomeDir, "123 456 789")},
-			CommandTimeout:  60 * time.Second,
-			TarExec:         "tar",
-		},
-	}
-
-	err = plugin.Exec()
-	assert.Nil(t, err)
-
-	// check file exist
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "123 456 789", "c.txt")); os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
-
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "123 456 789", "d.txt")); os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
-}
-
-func TestHostPortString(t *testing.T) {
-	if os.Getenv("SSH_AUTH_SOCK") != "" {
-		if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
-			t.Fatalf("exec: %v", err)
-		}
-	}
-
-	u, err := user.Lookup("drone-scp")
-	if err != nil {
-		t.Fatalf("Lookup: %v", err)
-	}
-
-	plugin := Plugin{
-		Config: Config{
-			Host:            []string{"localhost:22", "localhost:22"},
-			Username:        "drone-scp",
-			Protocol:        easyssh.PROTOCOL_TCP4,
-			Port:            8080,
-			KeyPath:         "tests/.ssh/id_rsa",
-			Source:          []string{"tests/global/*"},
-			StripComponents: 2,
-			Target:          []string{filepath.Join(u.HomeDir, "1234")},
-			CommandTimeout:  60 * time.Second,
-			TarExec:         "tar",
-		},
-	}
-
-	err = plugin.Exec()
-	assert.Nil(t, err)
-
-	// check file exist
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "1234", "c.txt")); os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
-
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "1234", "d.txt")); os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
-}
-
-// Unit test for hostPort
-func TestHostPort(t *testing.T) {
-	p := Plugin{
-		Config: Config{
-			Port:     8080,
-			Protocol: easyssh.PROTOCOL_TCP4,
-		},
-	}
-
-	// Test case 1: host string with port
-	host1 := "example.com:1234"
-	expectedHost1 := "example.com"
-	expectedPort1 := "1234"
-	actualHost1, actualPort1 := p.hostPort(host1)
-	if actualHost1 != expectedHost1 || actualPort1 != expectedPort1 {
-		t.Errorf("hostPort(%s) = (%s, %s); expected (%s, %s)", host1, actualHost1, actualPort1, expectedHost1, expectedPort1)
-	}
-
-	// Test case 2: host string without port
-	host2 := "example.com"
-	expectedHost2 := "example.com"
-	expectedPort2 := "8080" // default port
-	actualHost2, actualPort2 := p.hostPort(host2)
-	if actualHost2 != expectedHost2 || actualPort2 != expectedPort2 {
-		t.Errorf("hostPort(%s) = (%s, %s); expected (%s, %s)", host2, actualHost2, actualPort2, expectedHost2, expectedPort2)
-	}
-}
-
-func TestPlugin_hostPort(t *testing.T) {
-	type fields struct {
-		Config Config
-		Writer io.Writer
-	}
-	type args struct {
-		h string
-	}
-	tests := []struct {
-		name     string
-		fields   fields
-		args     args
-		wantHost string
-		wantPort string
-	}{
-		{
-			name: "default host and port",
-			fields: fields{
-				Config: Config{
-					Port: 22,
-				},
-			},
-			args: args{
-				h: "localhost",
-			},
-			wantHost: "localhost",
-			wantPort: "22",
-		},
-		{
-			name: "different port",
-			fields: fields{
-				Config: Config{
-					Port:     22,
-					Protocol: easyssh.PROTOCOL_TCP4,
-				},
-			},
-			args: args{
-				h: "localhost:443",
-			},
-			wantHost: "localhost",
-			wantPort: "443",
-		},
-		{
-			name: "ipv6",
-			fields: fields{
-				Config: Config{
-					Port:     22,
-					Protocol: easyssh.PROTOCOL_TCP6,
-				},
-			},
-			args: args{
-				h: "::1",
-			},
-			wantHost: "::1",
-			wantPort: "22",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			p := Plugin{
-				Config: tt.fields.Config,
-			}
-			gotHost, gotPort := p.hostPort(tt.args.h)
-			if gotHost != tt.wantHost {
-				t.Errorf("Plugin.hostPort() gotHost = %v, want %v", gotHost, tt.wantHost)
-			}
-			if gotPort != tt.wantPort {
-				t.Errorf("Plugin.hostPort() gotPort = %v, want %v", gotPort, tt.wantPort)
-			}
-		})
-	}
-}
-
-func TestIgnoreFolder(t *testing.T) {
+func TestCheckTargetFolderExist(t *testing.T) {
 	if os.Getenv("SSH_AUTH_SOCK") != "" {
 		if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
 			t.Fatalf("exec: %v", err)
@@ -962,11 +740,10 @@ func TestIgnoreFolder(t *testing.T) {
 		Config: Config{
 			Host:           []string{"localhost"},
 			Username:       "drone-scp",
-			Protocol:       easyssh.PROTOCOL_TCP4,
-			Port:           22,
+			Port:           "22",
 			KeyPath:        "tests/.ssh/id_rsa",
-			Source:         []string{"tests/*", "!tests/global"},
-			Target:         []string{filepath.Join(u.HomeDir, "test_ignore")},
+			Source:         []string{"tests/global/*"},
+			Target:         []string{filepath.Join(u.HomeDir, "__test__")},
 			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 		},
@@ -975,12 +752,6 @@ func TestIgnoreFolder(t *testing.T) {
 	err = plugin.Exec()
 	assert.Nil(t, err)
 
-	// check file exist
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "test_ignore", "global", "c.txt")); !os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
-
-	if _, err := os.Stat(filepath.Join(u.HomeDir, "test_ignore", "global", "d.txt")); !os.IsNotExist(err) {
-		t.Fatalf("SCP-error: %v", err)
-	}
+	err = plugin.Exec()
+	assert.Nil(t, err)
 }