From 9b57f85e472f74741dd9ba2130399472c6e53bde Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 21 Nov 2019 09:13:04 +0800 Subject: [PATCH] chore(cmd): trim space in command Signed-off-by: Bo-Yi Wu --- plugin.go | 3 +++ plugin_test.go | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/plugin.go b/plugin.go index 8458e76..401f192 100644 --- a/plugin.go +++ b/plugin.go @@ -195,6 +195,9 @@ func (p Plugin) scriptCommands() []string { commands := make([]string, 0) for _, cmd := range scripts { + if strings.TrimSpace(cmd) == "" { + continue + } commands = append(commands, cmd) if p.Config.ScriptStop { commands = append(commands, "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;") diff --git a/plugin_test.go b/plugin_test.go index 355b15c..fedb0ad 100644 --- a/plugin_test.go +++ b/plugin_test.go @@ -569,6 +569,16 @@ func TestPlugin_scriptCommands(t *testing.T) { }, want: []string{"mkdir a", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;", "mkdir c", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;", "mkdir b", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;"}, }, + { + name: "trim space", + fields: fields{ + Config: Config{ + Script: []string{"mkdir a", "mkdir b", "\t", " "}, + ScriptStop: false, + }, + }, + want: []string{"mkdir a", "mkdir b"}, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) {