From 4affef24a703a5c9f2cd7dfc008637b57e04dade Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 22 Aug 2022 09:08:04 -0700 Subject: [PATCH] .devcontainer/onCreate.sh, portability-updateContent.sh: Rename from post_create.sh, portability-post_start.sh --- .devcontainer/develop-docker-computop/devcontainer.json | 2 +- .devcontainer/downstream-archlinux-latest/devcontainer.json | 2 +- .devcontainer/downstream-docker-cocalc/devcontainer.json | 2 +- .devcontainer/downstream-docker-computop/devcontainer.json | 2 +- .devcontainer/{post_create.sh => onCreate.sh} | 0 .../portability-ubuntu-jammy-standard/devcontainer.json | 4 ++-- ...portability-post_start.sh => portability-updateContent.sh} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename .devcontainer/{post_create.sh => onCreate.sh} (100%) rename .devcontainer/{portability-post_start.sh => portability-updateContent.sh} (100%) diff --git a/.devcontainer/develop-docker-computop/devcontainer.json b/.devcontainer/develop-docker-computop/devcontainer.json index 3dd68a6e0e8..a8746244086 100644 --- a/.devcontainer/develop-docker-computop/devcontainer.json +++ b/.devcontainer/develop-docker-computop/devcontainer.json @@ -7,7 +7,7 @@ }, // Install build tools, get rid of sourcing /sage/activate in non-login shells. // libgmp.a is broken and leads to a build failure of ecm. - "onCreateCommand": ".devcontainer/post_create.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc", + "onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc", // Do not run configure within a sage-env (see #29485). // The pari package is broken in the computop/sage 9.5 image, need to reinstall. // Also libnauty is broken. diff --git a/.devcontainer/downstream-archlinux-latest/devcontainer.json b/.devcontainer/downstream-archlinux-latest/devcontainer.json index 5fff1dc7cdc..f0b79e01ae3 100644 --- a/.devcontainer/downstream-archlinux-latest/devcontainer.json +++ b/.devcontainer/downstream-archlinux-latest/devcontainer.json @@ -3,7 +3,7 @@ "name": "archlinux:latest downstream Sage", "image": "archlinux:latest", // Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal. - "onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/post_create.sh && touch ~/.bashrc", + "onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc", // There's no SAGE_LOCAL, so remove the symlink 'prefix'. "updateContentCommand": "rm -f prefix && ln -sf /usr venv", "extensions": [ diff --git a/.devcontainer/downstream-docker-cocalc/devcontainer.json b/.devcontainer/downstream-docker-cocalc/devcontainer.json index fc37d271530..626bdbb9996 100644 --- a/.devcontainer/downstream-docker-cocalc/devcontainer.json +++ b/.devcontainer/downstream-docker-cocalc/devcontainer.json @@ -6,7 +6,7 @@ "MAKE": "make -j4" }, // libgmp.a is broken and leads to a build failure of ecm. - "onCreateCommand": ".devcontainer/post_create.sh && rm -f /usr/local/sage/local/lib/libgmp.a", + "onCreateCommand": ".devcontainer/onCreate.sh && rm -f /usr/local/sage/local/lib/libgmp.a", // * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT): // - it bootstraps the Sage distribution, // - sets the symlink ``venv`` as expected, diff --git a/.devcontainer/downstream-docker-computop/devcontainer.json b/.devcontainer/downstream-docker-computop/devcontainer.json index 923a18fdf89..bb2e29e374e 100644 --- a/.devcontainer/downstream-docker-computop/devcontainer.json +++ b/.devcontainer/downstream-docker-computop/devcontainer.json @@ -7,7 +7,7 @@ }, // Install build tools, get rid of sourcing /sage/activate in non-login shells. // libgmp.a is broken and leads to a build failure of ecm. - "onCreateCommand": ".devcontainer/post_create.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc", + "onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc", // Do not run configure within a sage-env (see #29485). // The pari package is broken in the computop/sage 9.5 image, need to reinstall. // Also libnauty is broken. diff --git a/.devcontainer/post_create.sh b/.devcontainer/onCreate.sh similarity index 100% rename from .devcontainer/post_create.sh rename to .devcontainer/onCreate.sh diff --git a/.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json b/.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json index 0c4015a8add..f59a1178179 100644 --- a/.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json +++ b/.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json @@ -14,8 +14,8 @@ "containerEnv": { "MAKE": "make -j4" }, - "onCreateCommand": ".devcontainer/post_create.sh", - "updateContentCommand": ".devcontainer/portability-post_start.sh", + "onCreateCommand": ".devcontainer/onCreate.sh", + "updateContentCommand": ".devcontainer/portability-updateContent.sh", "extensions": [ "ms-python.python" ] diff --git a/.devcontainer/portability-post_start.sh b/.devcontainer/portability-updateContent.sh similarity index 100% rename from .devcontainer/portability-post_start.sh rename to .devcontainer/portability-updateContent.sh