Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enforce linux separator for tmp location #147

Merged
merged 2 commits into from
Jul 27, 2023
Merged

enforce linux separator for tmp location #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2839a1a
replace filepath.Join but simple concat to preserve / as temp dir sep…
umputun Jul 27, 2023
3f6d61f
add a comment clarifying why join is not used
umputun Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/runner/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ func (ec *execCmd) Copy(ctx context.Context) (resp execCmdResp, err error) {
// if sudo is set, we need to upload the file to a temporary directory and move it to the final destination
tmpRemoteDir := ec.uniqueTmp(tmpRemoteDirPrefix)
resp.details = fmt.Sprintf(" {copy: %s -> %s, sudo: true}", src, dst)
tmpDest := filepath.Join(tmpRemoteDir, filepath.Base(dst))
// not using filepath.Join because we want to keep the linux slash, see https://github.com/umputun/spot/issues/144
tmpDest := tmpRemoteDir + "/" + filepath.Base(dst)

// upload to a temporary directory with mkdir
err := ec.exec.Upload(ctx, src, tmpDest, &executor.UpDownOpts{Mkdir: true, Force: true, Exclude: ec.cmd.Copy.Exclude})
Expand Down Expand Up @@ -422,7 +423,9 @@ func (ec *execCmd) prepScript(ctx context.Context, s string, r io.Reader) (cmd,

// get temp file name for remote hostAddr
tmpRemoteDir := ec.uniqueTmp(tmpRemoteDirPrefix)
dst := filepath.Join(tmpRemoteDir, filepath.Base(tmp.Name())) // nolint
// the direct join with unix separator is intentional, we want to preserve the slash regardless of the host's OS
// see https://github.com/umputun/spot/issues/138
dst := tmpRemoteDir + "/" + filepath.Base(tmp.Name()) // nolint
scr = fmt.Sprintf("script: %s\n", dst) + scr

// upload the script to the remote hostAddr
Expand Down
Loading