浏览代码

Check that toxid gets installed

Bob Mottram 9 年前
父节点
当前提交
4f4354ba19
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      src/freedombone-image-customise

+ 5
- 2
src/freedombone-image-customise 查看文件

755
 	echo '    exit 2' >> $TEMP_SCRIPT
755
 	echo '    exit 2' >> $TEMP_SCRIPT
756
 	echo 'fi' >> $TEMP_SCRIPT
756
 	echo 'fi' >> $TEMP_SCRIPT
757
 	echo 'make install' >> $TEMP_SCRIPT
757
 	echo 'make install' >> $TEMP_SCRIPT
758
+	echo 'if [ ! -f /usr/local/bin/toxavahi ]; then' >> $TEMP_SCRIPT
759
+	echo '  exit 3' >> $TEMP_SCRIPT
760
+	echo 'fi' >> $TEMP_SCRIPT
758
 	echo 'toxavahi' >> $TEMP_SCRIPT
761
 	echo 'toxavahi' >> $TEMP_SCRIPT
759
-	echo 'echo "* *     * * *   root    toxavahi > /dev/null" >> /etc/crontab' >> $TEMP_SCRIPT
762
+	echo 'echo "* *     * * *   root    /usr/local/bin/toxavahi > /dev/null" >> /etc/crontab' >> $TEMP_SCRIPT
760
 	echo 'systemctl restart avahi-daemon' >> $TEMP_SCRIPT
763
 	echo 'systemctl restart avahi-daemon' >> $TEMP_SCRIPT
761
 	echo 'exit 0' >> $TEMP_SCRIPT
764
 	echo 'exit 0' >> $TEMP_SCRIPT
762
 	chmod +x $TEMP_SCRIPT
765
 	chmod +x $TEMP_SCRIPT
764
 
767
 
765
 	chroot "$rootdir" /root/$TEMP_SCRIPT_NAME
768
 	chroot "$rootdir" /root/$TEMP_SCRIPT_NAME
766
 	if [ ! "$?" = "0" ]; then
769
 	if [ ! "$?" = "0" ]; then
767
-		echo $'Unable to install toxid'
770
+		echo $"Unable to install toxid, returned $?"
768
 		rm $TEMP_SCRIPT
771
 		rm $TEMP_SCRIPT
769
 		exit 62835
772
 		exit 62835
770
 	fi
773
 	fi