Browse Source

Remove previous tox tomb

Bob Mottram 9 years ago
parent
commit
cd73ea5d74
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      src/freedombone-image-mesh

+ 9
- 2
src/freedombone-image-mesh View File

587
 		return
587
 		return
588
 	fi
588
 	fi
589
 
589
 
590
+	# close any existing open tomb
591
+	if [ -f /tmp/tox.tomb ]; then
592
+		tomb slam /tmp/tox.tomb
593
+	fi
594
+
595
+	# make a temporary password
590
 	TOMB_TOX_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
596
 	TOMB_TOX_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
591
 	tomb dig -s $TOMB_TOX_SIZE_MB /tmp/tox.tomb
597
 	tomb dig -s $TOMB_TOX_SIZE_MB /tmp/tox.tomb
592
 	tomb forge /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
598
 	tomb forge /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
593
 	tomb lock /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
599
 	tomb lock /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
594
 	tomb open /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
600
 	tomb open /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
601
+	# clear the password
595
 	TOMB_TOX_PASSWORD=
602
 	TOMB_TOX_PASSWORD=
603
+
596
 	if [ -d /media/tox ]; then
604
 	if [ -d /media/tox ]; then
597
 		if [ ! -d /home/$MY_USERNAME/.config ]; then
605
 		if [ ! -d /home/$MY_USERNAME/.config ]; then
598
 			mkdir -p /home/$MY_USERNAME/.config
606
 			mkdir -p /home/$MY_USERNAME/.config
599
 		fi
607
 		fi
600
 		if [ -d /home/$MY_USERNAME/.config/tox ]; then
608
 		if [ -d /home/$MY_USERNAME/.config/tox ]; then
601
-			cp -r /home/$MY_USERNAME/.config/tox/* /media/tox
602
 			rm -rf /home/$MY_USERNAME/.config/tox
609
 			rm -rf /home/$MY_USERNAME/.config/tox
603
-			ln -s /media/tox /home/$MY_USERNAME/.config/tox
604
 		fi
610
 		fi
611
+		ln -s /media/tox /home/$MY_USERNAME/.config/tox
605
 		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
612
 		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
606
 		chown -R $MY_USERNAME:$MY_USERNAME /media/tox
613
 		chown -R $MY_USERNAME:$MY_USERNAME /media/tox
607
 		echo "Tox Tomb created" >> /var/log/${PROJECT_NAME}.log
614
 		echo "Tox Tomb created" >> /var/log/${PROJECT_NAME}.log