Skip to content
Snippets Groups Projects
Commit a4db1bb0 authored by Bob Mottram's avatar Bob Mottram
Browse files

Missing fi

parent 0657232c
No related branches found
No related tags found
No related merge requests found
...@@ -134,6 +134,7 @@ function mesh_upgrade_golang { ...@@ -134,6 +134,7 @@ function mesh_upgrade_golang {
prefix= prefix=
if [ $rootdir ]; then if [ $rootdir ]; then
prefix="chroot $rootdir" prefix="chroot $rootdir"
fi
$prefix adduser --disabled-login --gecos 'go' go $prefix adduser --disabled-login --gecos 'go' go
GOARCH= GOARCH=
...@@ -149,7 +150,6 @@ function mesh_upgrade_golang { ...@@ -149,7 +150,6 @@ function mesh_upgrade_golang {
if [ ! $GOARCH ]; then if [ ! $GOARCH ]; then
return return
fi fi
GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
if [ ! -d ${rootdir}${INSTALL_DIR} ]; then if [ ! -d ${rootdir}${INSTALL_DIR} ]; then
...@@ -166,17 +166,17 @@ function mesh_upgrade_golang { ...@@ -166,17 +166,17 @@ function mesh_upgrade_golang {
exit 763562 exit 763562
fi fi
mv ${rootdir}/home/go/go ${rootdir}/home/go/go${GO_VERSION} mv ${rootdir}/home/go/go ${rootdir}/home/go/go${GO_VERSION}
echo "export GOROOT=/home/go" >> $rootdir/root/.bashrc echo "export GOROOT=/home/go" >> ${rootdir}/root/.bashrc
echo "export GOROOT=/home/go" >> $rootdir/home/$MY_USERNAME/.bashrc echo "export GOROOT=/home/go" >> ${rootdir}/home/$MY_USERNAME/.bashrc
echo "export GOROOT=/home/go" >> $rootdir/home/go/.bashrc echo "export GOROOT=/home/go" >> ${rootdir}/home/go/.bashrc
echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/root/.bashrc echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/root/.bashrc
echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/home/$MY_USERNAME/.bashrc echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/home/$MY_USERNAME/.bashrc
echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/home/go/.bashrc echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/home/go/.bashrc
echo 'export PATH=$PATH:$GOPATH' >> $rootdir/root/.bashrc echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/root/.bashrc
echo 'export PATH=$PATH:$GOPATH' >> $rootdir/home/$MY_USERNAME/.bashrc echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/home/$MY_USERNAME/.bashrc
echo 'export PATH=$PATH:$GOPATH' >> $rootdir/home/go/.bashrc echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/home/go/.bashrc
$prefix chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME $prefix chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME
$prefix chown -R go:go /home/go $prefix chown -R go:go /home/go
cp ${rootdir}/home/go/go${GO_VERSION}/bin/* ${rootdir}/usr/bin cp ${rootdir}/home/go/go${GO_VERSION}/bin/* ${rootdir}/usr/bin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment