瀏覽代碼

Missing fi

Bob Mottram 8 年之前
父節點
當前提交
a4db1bb0b4
共有 1 個檔案被更改,包括 10 行新增10 行删除
  1. 10
    10
      src/freedombone-utils-go

+ 10
- 10
src/freedombone-utils-go 查看文件

@@ -134,6 +134,7 @@ function mesh_upgrade_golang {
134 134
     prefix=
135 135
     if [ $rootdir ]; then
136 136
         prefix="chroot $rootdir"
137
+    fi
137 138
     $prefix adduser --disabled-login --gecos 'go' go
138 139
 
139 140
     GOARCH=
@@ -149,7 +150,6 @@ function mesh_upgrade_golang {
149 150
     if [ ! $GOARCH ]; then
150 151
         return
151 152
     fi
152
-
153 153
     GO_SOURCE=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz
154 154
 
155 155
     if [ ! -d ${rootdir}${INSTALL_DIR} ]; then
@@ -166,17 +166,17 @@ function mesh_upgrade_golang {
166 166
         exit 763562
167 167
     fi
168 168
     mv ${rootdir}/home/go/go ${rootdir}/home/go/go${GO_VERSION}
169
-    echo "export GOROOT=/home/go" >> $rootdir/root/.bashrc
170
-    echo "export GOROOT=/home/go" >> $rootdir/home/$MY_USERNAME/.bashrc
171
-    echo "export GOROOT=/home/go" >> $rootdir/home/go/.bashrc
169
+    echo "export GOROOT=/home/go" >> ${rootdir}/root/.bashrc
170
+    echo "export GOROOT=/home/go" >> ${rootdir}/home/$MY_USERNAME/.bashrc
171
+    echo "export GOROOT=/home/go" >> ${rootdir}/home/go/.bashrc
172 172
 
173
-    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/root/.bashrc
174
-    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/home/$MY_USERNAME/.bashrc
175
-    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> $rootdir/home/go/.bashrc
173
+    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/root/.bashrc
174
+    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/home/$MY_USERNAME/.bashrc
175
+    echo "export GOPATH=\$GOROOT/go${GO_VERSION}/bin" >> ${rootdir}/home/go/.bashrc
176 176
 
177
-    echo 'export PATH=$PATH:$GOPATH' >> $rootdir/root/.bashrc
178
-    echo 'export PATH=$PATH:$GOPATH' >> $rootdir/home/$MY_USERNAME/.bashrc
179
-    echo 'export PATH=$PATH:$GOPATH' >> $rootdir/home/go/.bashrc
177
+    echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/root/.bashrc
178
+    echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/home/$MY_USERNAME/.bashrc
179
+    echo 'export PATH=$PATH:$GOPATH' >> ${rootdir}/home/go/.bashrc
180 180
     $prefix chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME
181 181
     $prefix chown -R go:go /home/go
182 182
     cp ${rootdir}/home/go/go${GO_VERSION}/bin/* ${rootdir}/usr/bin