changeset 147: |
6b01a0f442bc |
parent 146: |
70bc6f20adcf |
child 148: |
3962df5f417f |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 21 Jan 2024 21:01:13 -0500 |
files: |
Containerfile.box makefile scripts/install-nushell-pack.sh |
description: |
nushell fixes (ty Antoine) |
1.1--- a/Containerfile.box Sun Jan 21 01:38:43 2024 -0500
1.2+++ b/Containerfile.box Sun Jan 21 21:01:13 2024 -0500
1.3@@ -24,4 +24,4 @@
1.4 RUN make core-install
1.5 RUN make clean
1.6 WORKDIR /
1.7-ENTRYPOINT ["/usr/local/bin/nu", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu", "-i"]
1.8\ No newline at end of file
1.9+# ENTRYPOINT ["/usr/local/bin/nu", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu", "-i"]
1.10\ No newline at end of file
2.1--- a/makefile Sun Jan 21 01:38:43 2024 -0500
2.2+++ b/makefile Sun Jan 21 21:01:13 2024 -0500
2.3@@ -80,8 +80,9 @@
2.4 NUSHELL_TARGET:=build/src/nushell
2.5 $(NUSHELL_TARGET):scripts/get-nushell.sh;$<
2.6 nushell:$(NUSHELL_TARGET)
2.7+# build without clipboard to avoid errors at runtime in container env
2.8 nushell-build:$(NUSHELL_TARGET)
2.9- cd $< && cargo build --workspace --release --features=dataframe,extra --locked
2.10+ cd $< && cargo build --workspace --release --no-default-features --features=default-no-clipboard,dataframe,extra --locked
2.11 nushell-install:$(NUSHELL_TARGET) nushell-build
2.12 cd $< && ./scripts/install-all.sh
2.13 ### SBCL
2.14@@ -191,9 +192,11 @@
2.15 cd $(NUSHELL_TARGET)/target/release/ && \
2.16 tar -I 'zstd' -cf ../../../../../$</nushell.tar.zst \
2.17 nu nu_plugin_custom_values nu_plugin_formats nu_plugin_gstat \
2.18- nu_plugin_inc nu_plugin_query utils
2.19+ nu_plugin_inc nu_plugin_query
2.20+
2.21 dist/tree-sitter:scripts/tree-sitter-install-langs.sh $(D)
2.22 PREFIX=$(D) $<
2.23+
2.24 # requires quicklisp loaded in .skelrc
2.25 dist/lisp/fasl:scripts/sbcl-save-core.sh
2.26 mkdir -pv $@
3.1--- a/scripts/install-nushell-pack.sh Sun Jan 21 01:38:43 2024 -0500
3.2+++ b/scripts/install-nushell-pack.sh Sun Jan 21 21:01:13 2024 -0500
3.3@@ -6,5 +6,5 @@
3.4 unzstd nushell.tar.zst
3.5 tar -xvf nushell.tar
3.6 rm -rf nushell.tar*
3.7-install -m 755 ./* /usr/local/bin/
3.8+install -m 755 ./nu* /usr/local/bin/
3.9