Skip to content

Commit 703c5ff

Browse files
authored
Merge pull request #216 from linuxserver/code-server-golang-apt
standardize apt-get
2 parents decc1f8 + f90b13c commit 703c5ff

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

root/etc/cont-init.d/95-apt-get

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
apt-get update

root/etc/cont-init.d/98-golang

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
echo "ensuring golang is in PATH"
44
if grep -q -E '^(export )?PATH=' /etc/services.d/code-server/run; then
5-
if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then
6-
sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run
7-
fi
8-
if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then
9-
sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run
10-
fi
5+
if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then
6+
sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run
7+
fi
8+
if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then
9+
sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run
10+
fi
1111
else
12-
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
12+
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
1313
fi
1414

1515
ARCH=$(uname -m)
1616
if [ -f "/golang/golang_${ARCH}.tar.gz" ]; then
17-
echo "Installing golang"
18-
tar xzf "/golang/golang_${ARCH}.tar.gz" -C /usr/local
19-
rm -rf /golang
17+
echo "Installing golang"
18+
tar xzf "/golang/golang_${ARCH}.tar.gz" -C /usr/local
19+
rm -rf /golang
2020

21-
echo "Installing gcc, to make CGO work"
22-
apt-get update && apt-get install -y gcc
21+
echo "Installing gcc, to make CGO work"
22+
apt-get install -y gcc
2323
else
24-
echo "Golang already installed, skipping"
24+
echo "Golang already installed, skipping"
2525
fi

0 commit comments

Comments
 (0)