merge

Author: CleoQc

README.md

@@ -1,5 +1,18 @@
-# script_tools
+# Description
 Common installation scripts used in multiple products around the Dexter Industries Galaxy of products.
 
-# to install:
-curl --silent https://raw.githubusercontent.com/DexterInd/script_tools/master/install_script_tools.sh | bash
+# Installing
+
+For installing the python packages of `script_tools` with root privileges (except for anything else than comes with it), use the following command:
+```
+sudo sh -c "curl -kL dexterindustries.com/update_tools | bash"
+```
+
+For installing the python packages of `script_tools` without root privileges (except for anything else than comes with it), use the following command:
+```
+curl -kL dexterindustries.com/update_tools | bash
+```
+
+# Updating
+
+For updating the package, you can use the same commands describe at the previous section.

auto_detect_rpi.py

@@ -69,7 +69,7 @@
 
 "900093" : ["Pi Zero v1.3", "RPI0"],
 
-"0x9000C1" : ["Pi Zero W", "RPI0"],
+"9000C1" : ["Pi Zero W", "RPI0"],
 
 "a02082" : ["Pi 3 Model B", "RPI3"],
 "a22082" : ["Pi 3 Model B", "RPI3"],

install_script_tools.sh

@@ -41,13 +41,14 @@ cd $PIHOME/$DEXTER/$LIB/$DEXTER
 # if not, clone the folder
 if [ ! -d $SCRIPT ] ; then
     # clone the folder
-    sudo git clone --quiet https://github.com/DexterInd/script_tools.git
+    git clone --quiet https://github.com/DexterInd/script_tools.git
 else
     cd $PIHOME/$DEXTER/$LIB/$DEXTER/$SCRIPT
-    sudo git pull --quiet
+    git pull --quiet
 fi
 
 cd $PIHOME/$DEXTER/$LIB/$DEXTER/$SCRIPT
-sudo python setup.py install
+sudo apt-get install build-essential libi2c-dev i2c-tools python-dev libffi-dev -y
+python autodetect_setup.py install
 
 popd > /dev/null

setup.py

@@ -28,5 +28,5 @@
 	author="Dexter Industries",
 	url="http://www.dexterindustries.com/GoPiGo/",
 	py_modules=['auto_detect_robot', 'auto_detect_rpi', 'i2c_mutex'],
-	#install_requires=open('requirements.txt').readlines(),
+	install_requires=['smbus-cffi', 'pyserial'],
 )