From 16fe1b68c68710fa96ef99286c781b4ef16b88cc Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 10 May 2022 11:59:55 +0200 Subject: [PATCH] fix: thread app name & stack name correctly --- cli/app/cmd.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/app/cmd.go b/cli/app/cmd.go index 36cbf1da..de71d939 100644 --- a/cli/app/cmd.go +++ b/cli/app/cmd.go @@ -104,10 +104,10 @@ Example: var sourceAndExec string if hasCmdArgs { logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs) - sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; . %s; %s %s", app.StackName(), abraSh, cmdName, parsedCmdArgs) + sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; . %s; %s %s", app.Name, app.StackName(), abraSh, cmdName, parsedCmdArgs) } else { logrus.Debug("did not detect any command arguments") - sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; . %s; %s", app.StackName(), abraSh, cmdName) + sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; . %s; %s", app.Name, app.StackName(), abraSh, cmdName) } cmd := exec.Command("/bin/sh", "-c", sourceAndExec) @@ -198,9 +198,9 @@ func runCmdRemote(app config.App, abraSh, serviceName, cmdName, cmdArgs string) var cmd []string if cmdArgs != "" { - cmd = []string{"/bin/sh", "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; . /tmp/abra.sh; %s %s", serviceName, app.StackName(), cmdName, cmdArgs)} + cmd = []string{"/bin/sh", "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s %s", serviceName, app.Name, app.StackName(), cmdName, cmdArgs)} } else { - cmd = []string{"/bin/sh", "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; . /tmp/abra.sh; %s", serviceName, app.StackName(), cmdName)} + cmd = []string{"/bin/sh", "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s", serviceName, app.Name, app.StackName(), cmdName)} } logrus.Debugf("running command: %s", strings.Join(cmd, " "))