From ba8668cc428914db87fa6d67a9f2d766ab432d28 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 17 Mar 2024 12:27:07 +0100 Subject: [PATCH] setup-vice: run in /tmp for writable files, rename for consistency --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/{vice-setup.sh => setup-vice.sh} | 1 + Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename .devcontainer/{vice-setup.sh => setup-vice.sh} (97%) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 76cda45..8a71c0c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ RUN sed -i '0,/Components: main/{s/^Components: main/Components: main contrib no RUN apt-get update && apt-get -y install --no-install-recommends vice cc65 emacs vim && apt-get -y install xpra -ADD vice-setup.sh /vice-setup.sh +ADD vice-setup.sh /setup-vice.sh USER vscode -RUN bash -x /vice-setup.sh +RUN bash -x /setup-vice.sh diff --git a/.devcontainer/vice-setup.sh b/.devcontainer/setup-vice.sh similarity index 97% rename from .devcontainer/vice-setup.sh rename to .devcontainer/setup-vice.sh index 13fa933..32d574f 100755 --- a/.devcontainer/vice-setup.sh +++ b/.devcontainer/setup-vice.sh @@ -1,5 +1,6 @@ #!/bin/bash +cd /tmp VICEVERSION=$(x128 --version | sed -e 's,x128 (VICE ,,g;s,),,g') wget https://downloads.sourceforge.net/project/vice-emu/releases/vice-${VICEVERSION?}.tar.gz mkdir -p ~/.local/share/vice diff --git a/Makefile b/Makefile index 7db84f2..098bfa9 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ format: clang-format-3.9 -i **/*.[ch] setup-vice: - ./.devcontainer/vice-setup.sh + ./.devcontainer/setup-vice.sh vice: package x128 -config vicerc -autostart kasse.d71 +go64 -remotemonitor -80col -speed 200