Преглед на файлове

Check that directory exists

Bob Mottram преди 8 години
родител
ревизия
cb3266d82f
No account linked to committer's email
променени са 1 файла, в които са добавени 13 реда и са изтрити 11 реда
  1. 13
    11
      src/freedombone-app-ipfs

+ 13
- 11
src/freedombone-app-ipfs Целия файл

408
 
408
 
409
 IPFS_PATH=\$GOPATH/bin
409
 IPFS_PATH=\$GOPATH/bin
410
 export PATH="\$GOPATH/bin:\$PATH:"
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
 fi
415
 fi
424
 chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
416
 chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
425
 
417
 
429
     exit 8242
421
     exit 8242
430
 fi
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
 cd \$GOPATH/src/$IPFS_GO_REPO2
429
 cd \$GOPATH/src/$IPFS_GO_REPO2
433
 git checkout $IPFS_COMMIT -b $IPFS_COMMIT
430
 git checkout $IPFS_COMMIT -b $IPFS_COMMIT
434
 exit 0
431
 exit 0
521
         exit 8242
518
         exit 8242
522
     fi
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
     cd $GOPATH/src/$IPFS_GO_REPO2
526
     cd $GOPATH/src/$IPFS_GO_REPO2
525
     git checkout $IPFS_COMMIT -b $IPFS_COMMIT
527
     git checkout $IPFS_COMMIT -b $IPFS_COMMIT
526
     if ! grep -q "ipfs commit" $COMPLETION_FILE; then
528
     if ! grep -q "ipfs commit" $COMPLETION_FILE; then