From 9a75fc1b508243360815b0d6052805c65c22aa53 Mon Sep 17 00:00:00 2001
From: mikoto2000 <mikoto2000@gmail.com>
Date: Thu, 13 Jun 2024 04:14:18 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=83=8A=E3=81=AE?=
 =?UTF-8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E9=96=93=E3=81=8C=E9=95=B7=E3=81=84?=
 =?UTF-8?q?=E3=81=A8=E5=B1=95=E9=96=8B=E3=81=97=E3=81=9F=20Vim=20=E3=81=8C?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

展開先をホームディレクトリに変更。
---
 devcontainer/devcontainer.go | 10 +++++++++-
 docker/docker.go             |  9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/devcontainer/devcontainer.go b/devcontainer/devcontainer.go
index 27cba2d..de5b426 100644
--- a/devcontainer/devcontainer.go
+++ b/devcontainer/devcontainer.go
@@ -106,7 +106,15 @@ func ExecuteDevcontainer(args []string, devcontainerPath string, vimFilePath str
 	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer cancel()
 
-	dockerVimArgs := []string{"exec", "--container-id", containerId, "--workspace-folder", workspaceFolder, "/" + vimFileName, "--appimage-extract-and-run", "-S", "/SendToTcp.vim", "-S", "/vimrc"}
+	dockerVimArgs := []string{
+		"exec",
+		"--container-id",
+		containerId,
+		"--workspace-folder",
+		workspaceFolder,
+		"sh",
+		"-c",
+		"/" + vimFileName + "--appimage-extract; ./squashfs-root/AppRun -S /SendToTcp.vim -S /vimrc"}
 	fmt.Printf("Start vim: `%s \"%s\"`\n", devcontainerPath, strings.Join(dockerVimArgs, "\" \""))
 	dockerExec := exec.CommandContext(ctx, devcontainerPath, dockerVimArgs...)
 	dockerExec.Stdin = os.Stdin
diff --git a/docker/docker.go b/docker/docker.go
index ac31c7e..679cd6e 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -97,7 +97,14 @@ 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, "/" + vimFileName, "--appimage-extract-and-run", "-S", "/SendToTcp.vim", "-S", "/vimrc"}
+	dockerVimArgs := []string{
+		"exec",
+		"-it",
+		containerId,
+		"sh",
+		"-c",
+		"/" + vimFileName + " --appimage-extract; ./squashfs-root/AppRun -S /SendToTcp.vim -S /vimrc",
+	}
 	fmt.Printf("Start vim: `%s \"%s\"`\n", CONTAINER_COMMAND, strings.Join(dockerVimArgs, "\" \""))
 	dockerExec := exec.CommandContext(ctx, CONTAINER_COMMAND, dockerVimArgs...)
 	dockerExec.Stdin = os.Stdin