From c9d854362d8da9703facba2134b2e0442c23c1e2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 5 Sep 2016 21:11:41 +0100 Subject: [PATCH] checkout --- man/freedombone-image.1.gz | Bin 3526 -> 3746 bytes src/freedombone-image-mesh | 2 ++ src/freedombone-image-vmdebootstrap | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index 4c75a87a3819ef688a4f949b7a850e6f82ad29e1..6b14b0007a5585bfb0156855bd7efd383f3e6a67 100644 GIT binary patch literal 3746 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 A^8f$< diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index 3b3d91a1..80a59a0f 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -757,6 +757,7 @@ function setup_ipfs { su -c "systemctl --user start ipfs" - $MY_USERNAME if [ -d /home/$MY_USERNAME/Public ]; then + rm /home/$MY_USERNAME/Desktop/Public rm -rf /home/$MY_USERNAME/Public fi @@ -803,6 +804,7 @@ function setup_ipfs { mkdir /home/$MY_USERNAME/Public echo $'Files within this directory will be publicly visible on the network' > /home/$MY_USERNAME/Public/README.txt chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Public + ln -s /home/$MY_USERNAME/Public /home/$MY_USERNAME/Desktop/Public su -c "echo \$($IPFS_COMMAND add -rq /home/$MY_USERNAME/Public | tail -n 1) > $IPFS_PUBLIC" - $MY_USERNAME if [ ! -f $IPFS_PUBLIC ]; then echo $'Unable to create public IPFS directory' >> $INSTALL_LOG diff --git a/src/freedombone-image-vmdebootstrap b/src/freedombone-image-vmdebootstrap index d9182569..38299617 100755 --- a/src/freedombone-image-vmdebootstrap +++ b/src/freedombone-image-vmdebootstrap @@ -38,7 +38,7 @@ else git clone git://git.liw.fi/vmdebootstrap vendor/vmdebootstrap fi cd vendor/vmdebootstrap -git checkout tags/vmdebootstrap-0.8 +git checkout tags/vmdebootstrap-0.8 -b tags/vmdebootstrap-0.8 for f in ../../vendor-patches/vmdebootstrap/* ; do echo applying $(basename $f) patch -p1 < $f