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