From 279018f74ceeb09b54ca5c9d6a347b87316c531f Mon Sep 17 00:00:00 2001
From: Johan <poljvd@gmail.com>
Date: Fri, 13 Dec 2013 16:02:15 +0100
Subject: [PATCH] Updated the install scripts to deal with the increased number
 of (effect) files

Former-commit-id: a7d7484fe9d8a23b217f22a35b092b53147fb393
---
 bin/copy_binaries_to_deploy.sh | 19 +++++++++++++++----
 bin/install_hyperion.sh        | 20 +++++++++-----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/bin/copy_binaries_to_deploy.sh b/bin/copy_binaries_to_deploy.sh
index 26595acd..f81ebbed 100755
--- a/bin/copy_binaries_to_deploy.sh
+++ b/bin/copy_binaries_to_deploy.sh
@@ -10,7 +10,18 @@ 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
+outfile="$repodir/deploy/hyperion.tar.gz"
+echo create $outfile
+
+tar --create --verbose --gzip --absolute-names --show-transformed-names \
+	--file "$outfile" \
+	--transform "s:$builddir/bin/:hyperion/bin/:" \
+	--transform "s:$repodir/effects/:hyperion/effects/:" \
+	--transform "s:$repodir/config/:hyperion/config/:" \
+	--transform "s://:/:g" \
+	"$builddir/bin/hyperiond" \
+	"$builddir/bin/hyperion-remote" \
+	"$builddir/bin/gpio2spi" \
+	"$builddir/bin/dispmanx2png" \
+	"$repodir/effects/"* \
+	"$repodir/config/hyperion.config.json"
diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh
index ca3196f6..09ecb6c5 100755
--- a/bin/install_hyperion.sh
+++ b/bin/install_hyperion.sh
@@ -16,22 +16,20 @@ fi
 # Stop hyperion daemon if it is running
 /sbin/initctl stop hyperion
 
-# Get the Hyperion executable
-wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperiond -P /usr/bin/
-chmod +x /usr/bin/hyperiond
+# Get and extract the Hyperion binaries and effects to /opt
+wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
 
-# Get the Hyperion command line utility
-wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion-remote -P /usr/bin/
-chmod +x /usr/bin/hyperion-remote
+# create links to the binaries
+ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
+ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
 
-# Copy the gpio changer (gpio->spi) to the /usr/bin
+# create link to the gpio changer (gpio->spi)
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/gpio2spi -P /usr/bin/
-	chmod +x /usr/bin/gpio2spi
+	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
 fi
 
-# Copy the hyperion configuration file to /etc
-wget -N https://raw.github.com/tvdzwan/hyperion/master/config/hyperion.config.json -P /etc/
+# Copy a link to the hyperion configuration file to /etc
+ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
 
 # Copy the service control configuration to /etc/int
 if [ $IS_XBIAN -eq 0 ]; then