cat instead of sleep to deadspin

BeryJu · Nov 7, 2022 · 384377f · 384377f
1 parent 391275b
commit 384377f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/mover/entrypoint.sh b/mover/entrypoint.sh
@@ -2,7 +2,7 @@
 if [[ $1 == "sync" ]]; then
     rsync -aHA --progress /source/ /dest
 elif [[ $1 == "sleep" ]]; then
-    sleep infinity
+    cat
 else
     echo "No command given. Make sure to use the correct mover image for your korb version."
     exit 1

diff --git a/pkg/strategies/export.go b/pkg/strategies/export.go
@@ -76,9 +76,12 @@ func (c *ExportStrategy) CopyOut(pod v1.Pod, config *rest.Config, name string) (
 		-1,
 		"downloading",
 	)
-	err = c.tempMover.Exec(pod, config, []string{
-		"tar", "cvf", "-", mover.SourceMount,
-	}, nil, io.MultiWriter(file, bar))
+	cmd := []string{
+		"bash",
+		"-c",
+		fmt.Sprintf("cd \"%s\" && tar cvf - .", mover.SourceMount),
+	}
+	err = c.tempMover.Exec(pod, config, cmd, nil, io.MultiWriter(file, bar))
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/strategies/import.go b/pkg/strategies/import.go
@@ -74,9 +74,12 @@ func (c *ImportStrategy) CopyInto(pod v1.Pod, config *rest.Config, localPath str
 		return err
 	}
 	defer file.Close()
-	err = c.tempMover.Exec(pod, config, []string{
-		"tar", "xvf", "-",
-	}, file, os.Stdout)
+	cmd := []string{
+		"bash",
+		"-c",
+		fmt.Sprintf("cd \"%s\" && tar xvf -", mover.SourceMount),
+	}
+	err = c.tempMover.Exec(pod, config, cmd, file, os.Stdout)
 	if err != nil {
 		return err
 	}