diff --git a/Dockerfile.rust b/Dockerfile.rust index bda7032..cc23411 100644 --- a/Dockerfile.rust +++ b/Dockerfile.rust @@ -17,7 +17,7 @@ ENV PATH="${PATH}:/root/.cargo/bin" # # %files # -COPY --chmod=0755 ./provision/scripts/rust/* /tmp/scripts/ +COPY --chmod=0755 ./provision/rust/* /tmp/scripts/ # # %post # @@ -29,7 +29,6 @@ RUN /tmp/scripts/install_dependencies.sh \ evcxr_repl \ evcxr_jupyter \ && evcxr_jupyter --install \ - && mv /tmp/scripts/install_wasm_tools.sh /usr/local/bin/install_wasm_tools \ && cleanup # # %runscript diff --git a/Makefile b/Makefile index 2858c99..121acf0 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ SCRIPTS = \ ./provision/notebook/install_code_server.sh \ ./provision/notebook/install_conda.sh \ ./provision/notebook/install_dependencies.sh \ + ./provision/rust/install_dependencies.sh \ ./provision/scripts/dev/install_apptainer.sh \ ./provision/scripts/dev/install_cosmopolitan.sh \ ./provision/scripts/dev/install_cuda.sh \ @@ -111,12 +112,11 @@ SCRIPTS = \ ./provision/scripts/notebook/install_lpython.sh \ ./provision/scripts/notebook/install_nim.sh \ ./provision/scripts/notebook/install_scala_jupyter_kernel.sh \ - ./provision/scripts/rust/install_dependencies.sh \ - ./provision/scripts/rust/install_wasm_tools.sh \ ./.github/actions/build-and-push-image/entrypoint.sh FUNCTIONS = \ ./provision/functions/cleanup \ ./provision/functions/download_notebooks \ + ./provision/functions/install_wasm_tools \ ./provision/functions/is_command \ ./provision/functions/is_installed \ ./provision/functions/move_lines \ diff --git a/provision/scripts/rust/install_wasm_tools.sh b/provision/functions/install_wasm_tools similarity index 100% rename from provision/scripts/rust/install_wasm_tools.sh rename to provision/functions/install_wasm_tools diff --git a/provision/scripts/rust/install_dependencies.sh b/provision/rust/install_dependencies.sh similarity index 100% rename from provision/scripts/rust/install_dependencies.sh rename to provision/rust/install_dependencies.sh