tweaks to run on the new machine

2 files changed, 31 insertions, 17 deletions

diff --git a/homepanel-control b/homepanel-control
index 0f31339..cb44727 100755
--- a/homepanel-control
+++ b/homepanel-control
@@ -3,29 +3,40 @@ use strict;
 use warnings;
 use Daemon::Control;
 use Path::Tiny;
+use Config::Any;
 
 my $basedir = path(__FILE__)->parent->realpath;
 
+my $config_file = $basedir->child('homepanel.conf');
+my $cfg_set = Config::Any->load_files({
+    files => [$config_file],
+    use_ext => 1,
+});
+my %config = map { %{(values %$_)[0]} } @$cfg_set;
+my $dest_dir = path($config{output_file})->parent->realpath;
+my $icons = $basedir->child('icons');
+
 exit Daemon::Control->new(
-    init_code => <<'INIT',
-export SHELL=/bin/bash
-export PERLBREW_ROOT=/data/perl5
-export PERLBREW_HOME=/home/dakkar/.perlbrew
-. /data/perl5/etc/bashrc
+    init_code => <<"INIT",
+if [ ! -d $dest_dir/icons ]; then
+  mkdir -p $dest_dir
+  mount -t tmpfs none $dest_dir
+  cp -a $icons $dest_dir/
+fi
+
+PERL5LIB="/home/dakkar/perl5/libs/HomePanel/lib/perl5\${PERL5LIB+:}\${PERL5LIB}"; export PERL5LIB;
 INIT
 
     name        => "HomePanel",
-    lsb_start   => '$local_fs $network $named $time',
-    lsb_stop    => '$local_fs $network $named $time',
     lsb_sdesc   => 'Home info panel',
     lsb_desc    => 'Show forecast, tube, bus status.',
     path        => path(__FILE__)->realpath,
 
     program     => $basedir->child('driver-async.pl'),
-    program_args => [ $basedir->child('homepanel.conf') ],
+    program_args => [ $config_file ],
 
     user => 'dakkar',
-    group => 'www-data',
+    group => 'users',
     directory => $basedir,
 
     pid_file    => $basedir->child('homepanel.pid'),
diff --git a/homepanel.initd b/homepanel.initd
index 9994db4..47f3568 100755
--- a/homepanel.initd
+++ b/homepanel.initd
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 
-# Generated at Sat Oct 18 11:54:37 2014 with Daemon::Control 0.001006
+# Generated at Sun Sep 27 12:39:21 2015 with Daemon::Control 0.001008
 
 ### BEGIN INIT INFO
 # Provides:          HomePanel
-# Required-Start:    $local_fs $network $named $time
-# Required-Stop:     $local_fs $network $named $time
+# Required-Start:    
+# Required-Stop:     
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Home info panel
@@ -14,10 +14,13 @@
 
 
 
-export SHELL=/bin/bash
-export PERLBREW_ROOT=/data/perl5
-export PERLBREW_HOME=/home/dakkar/.perlbrew
-. /data/perl5/etc/bashrc
+if [ ! -d /tmp/panel/icons ]; then
+  mkdir -p /tmp/panel
+  mount -t tmpfs none /tmp/panel
+  cp -a /home/dakkar/src/HomePanel/icons /tmp/panel/
+fi
+
+PERL5LIB="/home/dakkar/perl5/libs/HomePanel/lib/perl5${PERL5LIB+:}${PERL5LIB}"; export PERL5LIB;
 
 
 if [ -x /home/dakkar/src/HomePanel/homepanel-control ];