Skip to content

Commit

Permalink
Update run to change Path
Browse files Browse the repository at this point in the history
Change /etc/services.d/code-server/run to /etc/s6-overlay/s6-rc.d/svc-code-server/run
This allows the file to correctly change the path environment variable during the goland package add process. Currently when using the /etc/services.d/code-server/run path it results in an error and the path environment variable unchanged. 
I forked this repo, ran a build image to my own docker repo and was able to test that this change does indeed allow the file to change the environment variable correctly.
  • Loading branch information
Beariful committed Jan 12, 2023
1 parent a06cecd commit de35e6c
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/usr/bin/with-contenv bash

echo "**** ensuring golang is in PATH ****"
if grep -q -E '^(export )?PATH=' /etc/services.d/code-server/run; then
if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then
sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run
if grep -q -E '^(export )?PATH=' /etc/s6-overlay/s6-rc.d/svc-code-server/run; then
if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/s6-overlay/s6-rc.d/svc-code-server/run; then
sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/s6-overlay/s6-rc.d/svc-code-server/run
fi
if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then
sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run
if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/s6-overlay/s6-rc.d/svc-code-server/run; then
sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/s6-overlay/s6-rc.d/svc-code-server/run
fi
else
sed -i '/^#!\/usr\/bin/a \\n# Added by codeserver-golang\nexport PATH=/config/go/bin:$PATH:/usr/local/go/bin' /etc/services.d/code-server/run
sed -i '/^#!\/usr\/bin/a \\n# Added by codeserver-golang\nexport PATH=/config/go/bin:$PATH:/usr/local/go/bin' /etc/s6-overlay/s6-rc.d/svc-code-server/run
fi

ARCH=$(uname -m)
Expand Down

0 comments on commit de35e6c

Please sign in to comment.