Przeglądaj źródła

Check that tox client gets installed

Bob Mottram 9 lat temu
rodzic
commit
37ec4cebf8
1 zmienionych plików z 12 dodań i 6 usunięć
  1. 12
    6
      src/freedombone-mesh-install

+ 12
- 6
src/freedombone-mesh-install Wyświetl plik

568
     else
568
     else
569
         TOXIC_COMMIT_MAIN=$(cat /usr/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
569
         TOXIC_COMMIT_MAIN=$(cat /usr/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
570
     fi
570
     fi
571
-    if [ ${#TOX_COMMIT_MAIN} -gt 10 ]; then
571
+    if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
572
         TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
572
         TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
573
     fi  
573
     fi  
574
 
574
 
578
     $CHROOT_PREFIX git_clone $TOXIC_REPO $INSTALL_DIR/toxic
578
     $CHROOT_PREFIX git_clone $TOXIC_REPO $INSTALL_DIR/toxic
579
     $CHROOT_PREFIX cd $INSTALL_DIR/toxic
579
     $CHROOT_PREFIX cd $INSTALL_DIR/toxic
580
     $CHROOT_PREFIX git checkout $TOXIC_COMMIT -b $TOXIC_COMMIT
580
     $CHROOT_PREFIX git checkout $TOXIC_COMMIT -b $TOXIC_COMMIT
581
-    echo "Toxic commit:$TOXIC_COMMIT" >> $rootdir$COMPLETION_FILE
582
-
581
+    if ! grep -q "Toxic commit" $rootdir$COMPLETION_FILE; then
582
+        echo "Toxic commit:$TOXIC_COMMIT" >> $rootdir$COMPLETION_FILE
583
+    fi
584
+    
583
     $CHROOT_PREFIX make
585
     $CHROOT_PREFIX make
584
     if [ ! -f $INSTALL_DIR/toxic/build/toxic ]; then
586
     if [ ! -f $INSTALL_DIR/toxic/build/toxic ]; then
585
         exit 74872
587
         exit 74872
586
     fi
588
     fi
587
     $CHROOT_PREFIX make install
589
     $CHROOT_PREFIX make install
590
+    if [ ! -f /usr/local/bin/toxic ]; then
591
+        echo $'Tox client was not installed'
592
+        exit 63278
593
+    fi  
588
 }
594
 }
589
 
595
 
590
 function mesh_zeronet {
596
 function mesh_zeronet {
708
         if [ ! -f /usr/bin/toxic ]; then
714
         if [ ! -f /usr/bin/toxic ]; then
709
             $CHROOT_PREFIX sudo apt-get -y install toxic
715
             $CHROOT_PREFIX sudo apt-get -y install toxic
710
             echo "n
716
             echo "n
711
-                        /nick $USER
712
-                        /exit
713
-                        " | ${rootdir}/usr/bin/toxic -d
717
+       /nick $USER
718
+       /exit
719
+       " | ${rootdir}/usr/bin/toxic -d
714
         fi
720
         fi
715
     fi
721
     fi
716
 
722