From 2950eb9f92d055a30310e267f6a6edcc853c309b Mon Sep 17 00:00:00 2001
From: sam <sam@iMac27.local>
Date: Sat, 26 Sep 2020 16:47:22 +0200
Subject: [PATCH] better install

---
 server/install.sh        |  2 +-
 server/install.sh.darwin | 50 +++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/server/install.sh b/server/install.sh
index ccfe31b..76e317b 100755
--- a/server/install.sh
+++ b/server/install.sh
@@ -25,7 +25,7 @@ sudo apt install libjack-dev
 pip3 install python-rtmidi 
 pip3 install mido
 git clone https://github.com/ptone/pyosc --depth 1 /tmp/pyosc && cd /tmp/pyosc && sudo ./setup.py install 
-cd ..
+cd ../
 python3 configure.py
 # todo : ask for computer ip and run updateUI.py
 cd /tmp
diff --git a/server/install.sh.darwin b/server/install.sh.darwin
index fbee059..e0e3165 100644
--- a/server/install.sh.darwin
+++ b/server/install.sh.darwin
@@ -1,36 +1,40 @@
 #!/bin/bash
 brew upgrade
-brew install htop
-#brew install syncthing
-#brew install python-pip 
 brew install python3-pip 
 brew install git
 brew install redis
-brew install screen 
-brew install tmux
-#pip install numpy
-#pip install scipy
-#pip install python-rtmidi
-#pip install mido
-pip3 install scipy
-pip3 install numpy
-#pip install pygame==1.9.2
-#pip3 install pygame==1.9.2
-pip3 install redis
-pip3 install pysimpledmx 
-pip3 install DMXEnttecPro
-#brew install libasound2-dev
-#brew install libjack-dev
-pip3 install python-rtmidi 
-pip3 install mido
+#brew install htop
+#brew install syncthing
+#brew install screen 
+#brew install tmux
 #brew install nginx
 #brew install supervisor  
 
+pip3 install scipy
+pip3 install numpy
+#pip3 install pygame==1.9.2
+# brew install vulkan-headers
+pip3 install redis
+pip3 install pysimpledmx 
+pip3 install DMXEnttecPro
+brew install libasound2-dev
+brew install libjack-dev
+pip3 install python-rtmidi 
+pip3 install mido
+
+cd ../
+python3 configure.py
 #sudo cp syncthing.conf to /etc/supervisor/conf.d/
 git clone https://github.com/ptone/pyosc --depth 1 /tmp/pyosc && cd /tmp/pyosc && sudo ./setup.py install 
 cd /tmp
 brew install portaudio19-dev
 brew install cmake
+
+
+#
+# Ableton link 
+#
+
 git clone https://github.com/Ableton/link.git
 cd link
 git submodule update --init --recursive
@@ -39,12 +43,6 @@ cd build
 cmake ..
 cmake --build .
 
-
-#
-# Ableton link 
-#
-
-
 cd /tmp/
 git clone --recursive https://github.com/gonzaloflirt/link-python.git
 cd link-python