浏览代码

Check that directory exists

Bob Mottram 8 年前
父节点
当前提交
cb3266d82f
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 13 次插入11 次删除
  1. 13
    11
      src/freedombone-app-ipfs

+ 13
- 11
src/freedombone-app-ipfs 查看文件

@@ -408,18 +408,10 @@ fi
408 408
 
409 409
 IPFS_PATH=\$GOPATH/bin
410 410
 export PATH="\$GOPATH/bin:\$PATH:"
411
-if ! grep -q 'GOPATH/bin' ~/.bashrc; then
412
-    echo 'export PATH="\$GOPATH/bin:\$PATH:";' >> ~/.bashrc
413
-else
414
-    sed -i "s|systemctl set-environment GOPATH=.*|systemctl set-environment GOPATH=\$GOPATH|g" ~/.bashrc
415
-fi
411
+echo 'export PATH="\$GOPATH/bin:\$PATH:";' >> /home/$MY_USERNAME/.bashrc
416 412
 
417
-# set gopath for the user
418
-if ! grep -q "GOPATH=" /home/$MY_USERNAME/.bashrc; then
419
-    echo "export GOPATH=$GOPATH" >> /home/$MY_USERNAME/.bashrc
420
-    echo 'export PATH="\$GOPATH/bin:\$PATH:";' >> /home/$MY_USERNAME/.bashrc
421
-else
422
-    sed -i "s|export GOPATH=.*|export GOPATH=\$GOPATH|g" /home/$MY_USERNAME/.bashrc
413
+if grep -q 'GOPATH/bin' ~/.bashrc; then
414
+    sed -i "s|systemctl set-environment GOPATH=.*|systemctl set-environment GOPATH=\$GOPATH|g" ~/.bashrc
423 415
 fi
424 416
 chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
425 417
 
@@ -429,6 +421,11 @@ if [ ! "$?" = "0" ]; then
429 421
     exit 8242
430 422
 fi
431 423
 
424
+if [ ! -d $GOPATH/src/$IPFS_GO_REPO2 ]; then
425
+    echo $'go get failed to get ipfs'
426
+    exit 63923
427
+fi
428
+
432 429
 cd \$GOPATH/src/$IPFS_GO_REPO2
433 430
 git checkout $IPFS_COMMIT -b $IPFS_COMMIT
434 431
 exit 0
@@ -521,6 +518,11 @@ function install_ipfs_go {
521 518
         exit 8242
522 519
     fi
523 520
 
521
+    if [ ! -d $GOPATH/src/$IPFS_GO_REPO2 ]; then
522
+        echo $'go get failed to get ipfs'
523
+        exit 63923
524
+    fi
525
+
524 526
     cd $GOPATH/src/$IPFS_GO_REPO2
525 527
     git checkout $IPFS_COMMIT -b $IPFS_COMMIT
526 528
     if ! grep -q "ipfs commit" $COMPLETION_FILE; then