Skip to content

Commit 5567bc0

Browse files
cytopiacytopia
committed
Fix nvm path
1 parent 3934fdc commit 5567bc0

30 files changed

+682
-392
lines changed

‎.ansible/DOCKERFILES/Dockerfile-slim.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
387387
###
388388
RUN set -eux \
389389
&& { \
390+
echo; \
391+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
390392
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
391393
echo "export PATH"; \
394+
echo; \
395+
echo "# [Devilbox] Source Devilbox main bash config"; \
392396
echo ". /etc/bash-devilbox"; \
397+
echo; \
398+
echo "# [Devilbox] Source Devilbox custom configs"; \
393399
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
394400
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
395401
echo " if [ -r \"\${f}\" ]; then"; \

‎.ansible/DOCKERFILES/Dockerfile-work.j2

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,6 @@ RUN set -eux \
8787
{%- endif -%}
8888
{%- endfor %}
8989

90-
###
91-
### Configure Bash (composer, node yarn)
92-
###
93-
RUN set -eux \
94-
&& { \
95-
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
96-
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
97-
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
98-
echo 'PATH="{{ nvm_home }}/versions/node/$(nvm version default)/bin:${PATH}"'; \
99-
echo "export PATH"; \
100-
echo ". /etc/bash-devilbox"; \
101-
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
102-
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
103-
echo " if [ -r \"\${f}\" ]; then"; \
104-
echo " . \"\${f}\""; \
105-
echo " fi"; \
106-
echo " done"; \
107-
echo " unset f"; \
108-
echo "fi"; \
109-
} | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \
110-
&& chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc
111-
11290

11391

11492
########################################################################################################################
@@ -161,6 +139,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin
161139
COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib
162140

163141

142+
###
143+
### Configure Bash (composer, node yarn)
144+
###
145+
RUN set -eux \
146+
&& { \
147+
#echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
148+
echo; \
149+
echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \
150+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
151+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
152+
echo 'PATH="{{ nvm_home }}/versions/node/$(node --version)/bin:${PATH}"'; \
153+
echo "export PATH"; \
154+
echo; \
155+
echo "# [Devilbox] Ensure to load nvm"; \
156+
echo 'export NVM_DIR="{{ nvm_home }}"'; \
157+
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
158+
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
159+
#echo; \
160+
#echo ". /etc/bash-devilbox"; \
161+
#echo; \
162+
#echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
163+
#echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
164+
#echo " if [ -r \"\${f}\" ]; then"; \
165+
#echo " . \"\${f}\""; \
166+
#echo " fi"; \
167+
#echo " done"; \
168+
#echo " unset f"; \
169+
#echo "fi"; \
170+
} | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \
171+
&& chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc
172+
173+
164174

165175
########################################################################################################################
166176
########################################################################################################################

‎.ansible/group_vars/all/work-help.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ help_software_available:
117117
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
118118
| NVM_DIR="{{ nvm_home }}" bash \
119119
\
120-
&& { \
121-
echo 'export NVM_DIR="{{ nvm_home }}"'; \
122-
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
123-
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
124-
} >> /home/devilbox/.bashrc \
125-
\
126120
&& chown -R devilbox:devilbox "{{ nvm_home }}" \
127121
# Install latest and LTS version and yarn
128122
post: |

‎.ansible/group_vars/all/work.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ tools_enabled:
3737
- stylelint
3838
- svn
3939
- symfony-cli
40+
- taskfile
4041
- tig
4142
- vim
4243
- vue-cli
@@ -571,6 +572,12 @@ tools_available:
571572
command: curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir /usr/local/bin
572573
build_dep: []
573574
run_dep: []
575+
taskfile:
576+
disabled: []
577+
check: task --version | grep -E '[0-9][.0-9]+' || (task --version; false)
578+
all:
579+
type: custom
580+
command: sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/
574581
tig:
575582
disabled: []
576583
check: tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false)

‎Dockerfiles/slim/Dockerfile-5.2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
422422
###
423423
RUN set -eux \
424424
&& { \
425+
echo; \
426+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
425427
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
426428
echo "export PATH"; \
429+
echo; \
430+
echo "# [Devilbox] Source Devilbox main bash config"; \
427431
echo ". /etc/bash-devilbox"; \
432+
echo; \
433+
echo "# [Devilbox] Source Devilbox custom configs"; \
428434
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
429435
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
430436
echo " if [ -r \"\${f}\" ]; then"; \

‎Dockerfiles/slim/Dockerfile-5.3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
422422
###
423423
RUN set -eux \
424424
&& { \
425+
echo; \
426+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
425427
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
426428
echo "export PATH"; \
429+
echo; \
430+
echo "# [Devilbox] Source Devilbox main bash config"; \
427431
echo ". /etc/bash-devilbox"; \
432+
echo; \
433+
echo "# [Devilbox] Source Devilbox custom configs"; \
428434
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
429435
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
430436
echo " if [ -r \"\${f}\" ]; then"; \

‎Dockerfiles/slim/Dockerfile-5.4

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
422422
###
423423
RUN set -eux \
424424
&& { \
425+
echo; \
426+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
425427
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
426428
echo "export PATH"; \
429+
echo; \
430+
echo "# [Devilbox] Source Devilbox main bash config"; \
427431
echo ". /etc/bash-devilbox"; \
432+
echo; \
433+
echo "# [Devilbox] Source Devilbox custom configs"; \
428434
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
429435
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
430436
echo " if [ -r \"\${f}\" ]; then"; \

‎Dockerfiles/slim/Dockerfile-5.5

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
422422
###
423423
RUN set -eux \
424424
&& { \
425+
echo; \
426+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
425427
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
426428
echo "export PATH"; \
429+
echo; \
430+
echo "# [Devilbox] Source Devilbox main bash config"; \
427431
echo ". /etc/bash-devilbox"; \
432+
echo; \
433+
echo "# [Devilbox] Source Devilbox custom configs"; \
428434
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
429435
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
430436
echo " if [ -r \"\${f}\" ]; then"; \

‎Dockerfiles/slim/Dockerfile-5.6

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
426426
###
427427
RUN set -eux \
428428
&& { \
429+
echo; \
430+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
429431
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
430432
echo "export PATH"; \
433+
echo; \
434+
echo "# [Devilbox] Source Devilbox main bash config"; \
431435
echo ". /etc/bash-devilbox"; \
436+
echo; \
437+
echo "# [Devilbox] Source Devilbox custom configs"; \
432438
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
433439
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
434440
echo " if [ -r \"\${f}\" ]; then"; \

‎Dockerfiles/slim/Dockerfile-7.0

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
426426
###
427427
RUN set -eux \
428428
&& { \
429+
echo; \
430+
echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \
429431
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
430432
echo "export PATH"; \
433+
echo; \
434+
echo "# [Devilbox] Source Devilbox main bash config"; \
431435
echo ". /etc/bash-devilbox"; \
436+
echo; \
437+
echo "# [Devilbox] Source Devilbox custom configs"; \
432438
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
433439
echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
434440
echo " if [ -r \"\${f}\" ]; then"; \

0 commit comments

Comments
 (0)