diff --git a/Gruntfile.js b/Gruntfile.js index 420fb0b..2f8da5a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -21,6 +21,10 @@ module.exports = function (grunt) { dist: 'dist' }; + // Paths to ssh config & private key + var sshConfigFile = '.ssh/testServer.json'; + var sshKeyFile = '.ssh/test-server-key/'; + // Define the configuration for all the tasks grunt.initConfig({ @@ -313,10 +317,10 @@ module.exports = function (grunt) { // "password": 'include-only-if-not-using-private-key-below' // } sshconfig: { - testServer: grunt.file.readJSON('.ssh/testServer.json') + testServer: grunt.file.exists(sshConfigFile) ? grunt.file.readJSON('.ssh/testServer.json') : null }, // This is the private key for the username on the host defined in testServer.json - testServerKey: grunt.file.read('.ssh/test-server-key'), + testServerKey: grunt.file.exists(sshKeyFile) ? grunt.file.read('.ssh/test-server-key') : null, // Removes everything at the deploy location to avoid filling up the server with revved files. sshexec: { cleanTest: { diff --git a/app/index.html b/app/index.html index 6ce825d..0f4a0da 100755 --- a/app/index.html +++ b/app/index.html @@ -123,8 +123,7 @@ - + diff --git a/bower.json b/bower.json index cb40f92..76829f0 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jamstash", - "version": "4.2.1", + "version": "4.2.2", "description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming", "authors": [ "tsquillario (https://github.com/tsquillario)", diff --git a/manifest.json b/manifest.json index d490ab0..d5b20a4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Jamstash", "description": "HTML5 Player for Subsonic & Archive.org", - "version": "4.2.1", + "version": "4.2.2", "app": { "launch": { "web_url": "http://jamstash.com" diff --git a/package.json b/package.json index ec6004b..76a2661 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jamstash", - "version": "4.2.1", + "version": "4.2.2", "description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming", "author": "Trevor Squillario (https://github.com/tsquillario)", "contributors": [ @@ -46,9 +46,9 @@ "grunt-usemin": "^2.6.0", "grunt-wiredep": "^1.9.0", "jshint-stylish": "^1.0.0", - "karma": "^0.12.24", + "karma": "^0.12.25", "karma-chrome-launcher": "^0.1.5", - "karma-jasmine": "^0.2.3", + "karma-jasmine": "^0.3.0", "karma-phantomjs-launcher": "^0.1.4", "load-grunt-tasks": "^1.0.0", "sellout": "0.0.1",