Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git

Conflicts:
	bin/install_hyperion.sh
	deploy/hyperion.conf

Former-commit-id: 3a51538a8d50f7f3198a044c29200ec6dba4e931

bin/copy_binaries_to_deploy.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ "$#" -ne 2 ] || ! [ -d "$1" ] || ! [ -d "$2" ]; then
+  echo "Usage: $0 <BUILD-DIR> <REPO-DIR>" >&2
+  exit 1
+fi
+
+builddir="$1"
+repodir="$2"
+echo build directory = $builddir
+echo repository root dirrectory = $repodir
+
+echo Copying binaries
+cp -v "$builddir"/bin/hyperiond       "$repodir"/deploy
+cp -v "$builddir"/bin/hyperion-remote "$repodir"/deploy
+cp -v "$builddir"/bin/gpio2spi        "$repodir"/deploy

bin/install_hyperion.sh

@@ -13,15 +13,22 @@ fi
 # Stop hyperion daemon if it is running
 initctl stop hyperion
 
-# Copy the hyperion-binaries to the /usr/bin
-wget raw.github.com/tvdzwan/hyperion/master/deploy/hyperiond -P /usr/bin/
-wget raw.github.com/tvdzwan/hyperion/master/deploy/hyperion-remote -P /usr/bin/
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
+
+# Copy the gpio changer (gpio->spi) to the /usr/bin
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
 
 # Copy the hyperion configuration file to /etc
-wget raw.github.com/tvdzwan/hyperion/master/config/hyperion.config.json -P /etc/
+wget -N github.com/tvdzwan/hyperion/raw/master/config/hyperion.config.json -P /etc/
 
 # Copy the service control configuration to /etc/int
-wget raw.github.com/tvdzwan/hyperion/master/bin/hyperion.conf -P /etc/init/
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
+
+# Set permissions
+chmod +x /usr/bin/hyperiond
+chmod +x /usr/bin/hyperion-remote
+chmod +x /usr/bin/gpio2spi
 
 # Start the hyperion daemon
 initctl start hyperion