Browse Source

Check that patchwork directory gets created

Bob Mottram 7 years ago
parent
commit
0f2fb846b3
1 changed files with 3 additions and 6 deletions
  1. 3
    6
      src/freedombone-image-customise

+ 3
- 6
src/freedombone-image-customise View File

@@ -568,6 +568,9 @@ install_patchwork() {
568 568
     get_npm_arch
569 569
 
570 570
     git clone $PATCHWORK_REPO $rootdir/etc/patchwork
571
+    if [ ! -d $rootdir/etc/patchwork ]; then
572
+        exit 7823520
573
+    fi
571 574
     cd $rootdir/etc/patchwork
572 575
     git checkout $PATCHWORK_COMMIT -b $PATCHWORK_COMMIT
573 576
 
@@ -581,12 +584,6 @@ npm install --arch=$NPM_ARCH git-ssb
581 584
 EOF
582 585
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_patchwork
583 586
     chroot "$rootdir" /usr/bin/install_patchwork
584
-    if [ ! -f /usr/bin/patchwork ]; then
585
-        if [ ! -f /usr/local/bin/patchwork ]; then
586
-            echo $'Unable to install SSB Patchwork peer'
587
-            exit 783524
588
-        fi
589
-    fi
590 587
     rm $rootdir/usr/bin/install_patchwork
591 588
 
592 589
     echo '#!/bin/bash' > $rootdir/usr/bin/start_patchwork