Merge pull request #45 from mikoto2000/fix-docker-run-on-mac

macOS で run コマンドが失敗する問題を修正。

Makefile

@@ -20,6 +20,9 @@ WATCH_SRC := ./main.go \
 						 ./devcontainer/readConfigurationResult.go \
 						 ./devcontainer/upCommandResult.go \
 						 ./docker/docker.go \
+						 ./docker/dockerVimArgs_darwin_arm64.go \
+						 ./docker/dockerVimArgs_linux_amd64.go \
+						 ./docker/dockerVimArgs_windows_amd64.go \
 						 ./docker/dockerPsResult.go \
 						 ./dockercompose/dockerCompose.go \
 						 ./dockercompose/dockerComposePsResult.go \

docker/docker.go

@@ -81,7 +81,7 @@ func Run(args []string, vimFilePath string, cdrPath string, configDirForDocker s
 
 	// コンテナへ appimage を転送して実行権限を追加
 	// `docker cp <os.UserCacheDir/devcontainer.vim/Vim-AppImage> <dockerrun 時に標準出力に表示される CONTAINER ID>:/`
-	err = Cp("AppImage", vimFilePath, containerID, "/")
+	err = Cp("vim", vimFilePath, containerID, "/")
 	if err != nil {
 		return err
 	}
@@ -121,14 +121,7 @@ func Run(args []string, vimFilePath string, cdrPath string, configDirForDocker s
 	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer cancel()
 
-	dockerVimArgs := []string{
-		"exec",
-		"-it",
-		containerID,
-		"sh",
-		"-c",
-		"cd ~; /" + vimFileName + " --appimage-extract > /dev/null; cd -; ~/squashfs-root/AppRun --cmd \"let g:devcontainer_vim = v:true\" -S /SendToTcp.vim -S /vimrc",
-	}
+	dockerVimArgs := DockerVimArgs(containerID, vimFileName)
 	fmt.Printf("Start vim: `%s \"%s\"`\n", containerCommand, strings.Join(dockerVimArgs, "\" \""))
 	dockerExec := exec.CommandContext(ctx, containerCommand, dockerVimArgs...)
 	dockerExec.Stdin = os.Stdin

docker/dockerVimArgs_darwin_arm64.go

@@ -0,0 +1,13 @@
+//go:build darwin && arm64
+
+package docker
+
+func DockerVimArgs(containerID string, vimFileName string) []string {
+	return []string{
+		"exec",
+		"-it",
+		containerID,
+		"sh",
+		"-c",
+		"cd /; tar zxf ./" + vimFileName + " -C ~/ > /dev/null; cd ~; sudo rm -rf ~/vim-static; mv $(ls -d ~/vim-*-aarch64) ~/vim-static;~/vim-static/AppRun --cmd \"let g:devcontainer_vim = v:true\" -S /SendToTcp.vim -S /vimrc"}
+}

docker/dockerVimArgs_linux_amd64.go

@@ -0,0 +1,13 @@
+//go:build linux && amd64
+
+package docker
+
+func DockerVimArgs(containerID string, vimFileName string) []string {
+	return []string{
+		"exec",
+		"-it",
+		containerID,
+		"sh",
+		"-c",
+		"cd ~; /" + vimFileName + " --appimage-extract > /dev/null; cd -; ~/squashfs-root/AppRun --cmd \"let g:devcontainer_vim = v:true\" -S /SendToTcp.vim -S /vimrc"}
+}

docker/dockerVimArgs_windows_amd64.go

@@ -0,0 +1,13 @@
+//go:build windows && amd64
+
+package docker
+
+func DockerVimArgs(containerID string, vimFileName string) []string {
+	return []string{
+		"exec",
+		"-it",
+		containerID,
+		"sh",
+		"-c",
+		"cd ~; /" + vimFileName + " --appimage-extract > /dev/null; cd -; ~/squashfs-root/AppRun --cmd \"let g:devcontainer_vim = v:true\" -S /SendToTcp.vim -S /vimrc"}
+}