diff --git a/.gitignore b/.gitignore index b42d862..bdde2da 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ coverage.html dest node_modules +sonos-now-playing.log .DS_Store diff --git a/Gruntfile.js b/Gruntfile.js index 68516db..a836896 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -49,8 +49,7 @@ module.exports = function(grunt) { server: { files: [ {expand: true, cwd: 'src/', src: ['config.json'], dest: 'dest/', flatten: true}, - {expand: true, cwd: 'src/server/', src: ['*.js'], dest: 'dest/', flatten: true}, - {expand: true, cwd: 'src/server/', src: ['*.sh'], dest: 'dest/', flatten: true} + {expand: true, cwd: 'src/server/', src: ['*.js'], dest: 'dest/', flatten: true} ] }, client: { diff --git a/bin/run.sh b/bin/run.sh index 2e95166..787a356 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,5 +1,6 @@ #!/bin/sh -/opt/node/bin/node /home/pi/Documents/sonos-now-playing/dest/app.js & +cd /home/pi/Documents/sonos-now-playing/dest +/opt/node/bin/node ./app.js & response=0 while [ $response -ne 200 ] do diff --git a/src/server/sleep.sh b/bin/sleep.sh similarity index 100% rename from src/server/sleep.sh rename to bin/sleep.sh diff --git a/src/server/wake.sh b/bin/wake.sh similarity index 100% rename from src/server/wake.sh rename to bin/wake.sh diff --git a/src/server/screensaver.js b/src/server/screensaver.js index 8cdd25b..f602ef2 100644 --- a/src/server/screensaver.js +++ b/src/server/screensaver.js @@ -33,13 +33,13 @@ Screensaver.prototype.check = function() { Screensaver.prototype.sleep = function() { this.isSleeping = true; Logger.info("Starting screensaver"); - exec('/home/pi/Documents/sonos-now-playing/dest/sleep.sh', Screensaver.execHandler); + exec('../bin/sleep.sh', Screensaver.execHandler); }; Screensaver.prototype.wake = function() { this.isSleeping = false; Logger.info("Stopping screensaver"); - exec('/home/pi/Documents/sonos-now-playing/dest/wake.sh', Screensaver.execHandler); + exec('../bin/wake.sh', Screensaver.execHandler); }; module.exports = Screensaver;