actions/drone-scp
1
0
Fork 0
mirror of https://github.com/appleboy/drone-scp.git synced 2026-03-05 23:17:02 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

refactor: remove unnecessary quotes in plugin build process (#177)

Browse Source 
- Modify `rmcmd` and `mkdircmd` to remove unneeded quotes
- Update `buildUnTarArgs` in `plugin.go` to use target without quotes
- Add `Exec` function to `plugin.go` with `strings.Replace` call
- Update tests in `plugin_test.go` to use target without quotes

ref: https://github.com/appleboy/scp-action/issues/112
This commit is contained in:
Bo-Yi Wu 2023-04-16 12:05:23 +08:00 committed by GitHub
parent c663c07449
commit 665c665298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command.go
View File

@ -5,7 +5,7 @@ func rmcmd(os, target string) string {
case "windows": case "windows":
return "DEL /F /S " + target return "DEL /F /S " + target
case "unix": case "unix":
return "rm -rf '" + target + "'" return "rm -rf " + target
} }
return "" return ""
} }
@ -15,7 +15,7 @@ func mkdircmd(os, target string) string {
case "windows": case "windows":
return "if not exist " + target + " mkdir " + target return "if not exist " + target + " mkdir " + target
case "unix": case "unix":
return "mkdir -p '" + target + "'" return "mkdir -p " + target
} }
return "" return ""

3
plugin.go
View File

@ -209,7 +209,7 @@ func (p *Plugin) buildUnTarArgs(target string) []string {
args = append(args, args = append(args,
"-C", "-C",
"'"+target+"'", target,
) )
return args return args
@ -304,6 +304,7 @@ func (p *Plugin) Exec() error {
} }
for _, target := range p.Config.Target { for _, target := range p.Config.Target {
target = strings.Replace(target, " ", "\\ ", -1)
// remove target folder before upload data // remove target folder before upload data
if p.Config.Remove { if p.Config.Remove {
p.log(host, "Remove target folder:", target) p.log(host, "Remove target folder:", target)

12
plugin_test.go
View File

@ -615,7 +615,7 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
args: args{ args: args{
target: "foo", target: "foo",
}, },
want: []string{"tar", "-zxf", "foo.tar.gz", "-C", "'foo'"}, want: []string{"tar", "-zxf", "foo.tar.gz", "-C", "foo"},
}, },
{ {
name: "strip components", name: "strip components",
@ -631,7 +631,7 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
args: args{ args: args{
target: "foo", target: "foo",
}, },
want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "-C", "'foo'"}, want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "-C", "foo"},
}, },
{ {
name: "overwrite", name: "overwrite",
@ -647,7 +647,7 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
args: args{ args: args{
target: "foo", target: "foo",
}, },
want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "-C", "'foo'"}, want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "-C", "foo"},
}, },
{ {
name: "unlink first", name: "unlink first",
@ -663,7 +663,7 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
args: args{ args: args{
target: "foo", target: "foo",
}, },
want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "'foo'"}, want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "foo"},
}, },
{ {
name: "output folder path with space", name: "output folder path with space",
@ -677,9 +677,9 @@ func TestPlugin_buildUnTarArgs(t *testing.T) {
DestFile: "foo.tar.gz", DestFile: "foo.tar.gz",
}, },
args: args{ args: args{
target: "foo bar", target: "foo\\ bar",
}, },
want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "'foo bar'"}, want: []string{"tar", "-zxf", "foo.tar.gz", "--strip-components", "2", "--overwrite", "--unlink-first", "-C", "foo\\ bar"},
}, },
} }
for _, tt := range tests { for _, tt := range tests {