From 99be5ac1000029e10bab5ccac2f385a901d52ee8 Mon Sep 17 00:00:00 2001
From: Aart van Halteren <aart.van.halteren@philips.com>
Date: Tue, 15 Jul 2014 17:57:58 +0200
Subject: [PATCH] Improved etc/init.d script

---
 etc/smartmeter | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/etc/smartmeter b/etc/smartmeter
index 8eb1521..2fbfe47 100755
--- a/etc/smartmeter
+++ b/etc/smartmeter
@@ -5,9 +5,15 @@
 # description: Starts Smartmeter as an unprivileged user.
 #
 
-# Create a wrapper using 'rvm alias smartmeter ruby-1.9.3-p484@smartmeter'
+if [[ -s "/usr/local/rvm/environments/ruby-1.9.3-p484@smartmeter" ]]
+then
+  source "/usr/local/rvm/environments/ruby-1.9.3-p484@smartmeter"
+  exec sudo -u www-data ruby /mnt/usb/ruby/smartmeter/daemonize.rb $1
+  RETVAL=$?
 
-sudo -u www-data /usr/local/rvm/wrappers/smartmeter/ruby /home/pcog/smartmeter/daemonize.rb $1
-RETVAL=$?
+  exit $RETVAL
+else
+  echo "ERROR: Missing RVM environment file: '/usr/local/rvm/environments/ruby-1.9.3-p484@smartmeter'" >&2
+  exit 1
+fi
 
-exit $RETVAL