Merge pull request #203 from donovan6000/devel

Devel

Changelog

@@ -1,5 +1,9 @@
 Changelog:
 
+V1.14 December 5th, 2016
+
+	* Fixed macOS installer
+
 V1.13 December 3rd, 2016
 
 	* Fixed Safari related JavaScript issue

README.md

@@ -4,7 +4,7 @@
 ### Description
 M33 Fio is a general purpose plugin for [OctoPrint](http://octoprint.org/) that extends its capabilities to include many useful feature like the ability to use a Micro 3D printer, modify a model before printing it, host a webcam stream, and much more.
 
-The latest version of M33 Fio is V1.13 released on December 3rd, 2016, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).
+The latest version of M33 Fio is V1.14 released on December 5th, 2016, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).
 
 ### Features
 * Adds a model viewer tab to OctoPrint's interface where any uploaded model can be viewed

installers/macOS/install.sh

@@ -45,7 +45,7 @@ else
 		done
 
 		# Install command line tools
-		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/command%20line%20tools%20installer.bash'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/macOS/command%20line%20tools%20installer.bash'
 		do
 			:
 		done
@@ -198,23 +198,23 @@ else
 		rm master.zip
 
 		# Install heatbed drivers
-		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/CH34x_Install.pkg'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/macOS/CH34x_Install.pkg'
 		do
 			:
 		done
 		installer -allowUntrusted -pkg CH34x_Install.pkg -target /
 		rm CH34x_Install.pkg
 
 		# Add OctoPrint to startup programs
-		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/com.octoprint.app.plist'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/macOS/com.octoprint.app.plist'
 		do
 			:
 		done
 		sed -i '' -e 's/path to octoprint/\/Users\/'"$SUDO_USER"'\/Library\/Python\/2.7\/bin\/octoprint/g' com.octoprint.app.plist
 		mv com.octoprint.app.plist '/Library/LaunchAgents'
 
 		# Create URL link on desktop
-		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/shortcut.zip'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/macOS/shortcut.zip'
 		do
 			:
 		done