From 8f284b7fe9c87ba832937b1a9b8845caf5375a77 Mon Sep 17 00:00:00 2001
From: Julius Riegel <trivernis@hotmail.de>
Date: Sat, 13 Jan 2018 14:58:24 +0100
Subject: [PATCH] changed update file

---
 .idea/workspace.xml | 27 +++++++++++++++++++++------
 update.sh           |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df54b63..ba7c870 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="49388e57-2b9e-468a-b880-1d7fb243112d" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/update.sh" afterPath="$PROJECT_DIR$/update.sh" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -29,7 +26,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="287">
@@ -41,6 +38,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="update.sh" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/update.sh">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="stream.sh" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/stream.sh">
           <provider selected="true" editor-type-id="text-editor">
@@ -79,6 +86,7 @@
         <option value="$PROJECT_DIR$/servo_2.py" />
         <option value="$PROJECT_DIR$/thermo.py" />
         <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/update.sh" />
       </list>
     </option>
   </component>
@@ -279,7 +287,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/ultrasonic.py" />
     <entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
     <entry file="file://$PROJECT_DIR$/gyro.py" />
     <entry file="file://$PROJECT_DIR$/install.sh">
@@ -459,5 +466,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/update.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/update.sh b/update.sh
index fb4ab47..983dd11 100644
--- a/update.sh
+++ b/update.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 cd ..
 if [ -d "spydian/" ];then
-    sudo git clone https://bitbucket.org/trivernis/spydian.git spydian_update
+    sudo git -b develop clone https://bitbucket.org/trivernis/spydian.git spydian_update
     sudo rsync -a ./spydian_update/ ./spydian/
     sudo rm -r ./spydian_update/
     sudo chmod -R u+rw ./spydian/