Merge pull request #542 from prey/Fix-volume-unmute-to-hundred

Fixes action 'alarm'; Unmute and volume to a 100 %.

lib/agent/actions/alarm/index.js

@@ -13,14 +13,15 @@ var fs       = require('fs'),
     os_name  = process.platform.replace('darwin', 'mac').replace('win32', 'windows'),
     commands = require('./' + os_name),
     Emitter  = require('events').EventEmitter,
-    system   = require('./../../common').system;
+    common   = require('./../../common'),
+    logger   = common.logger.prefix('actions'),
+    system   = common.system;
 
 var child,
     emitter,
     raise_interval;
 
 exports.start = function(id, options, cb) {
-
   var error,
       self     = this,
       returned = 0;
@@ -38,6 +39,16 @@ exports.start = function(id, options, cb) {
   }
 
   var raise_volume = function(cb) {
+    if (os_name == 'linux'){
+      const unmuteRaiseCommands = commands.raise_volume.split('&&');
+      if(unmuteRaiseCommands.length < 2) return;
+      system.run_as_logged_user(unmuteRaiseCommands[0], [], (err) => {
+        if (err) 
+          logger.info(`ERROR while raising volume: ${err}`);
+        system.run_as_logged_user(unmuteRaiseCommands[1], [], cb);
+      });
+      return;
+    }
     exec(commands.raise_volume, cb);
   }
 

lib/agent/actions/alarm/linux.js

@@ -1,2 +1,2 @@
 exports.play = 'mpg123';
-exports.raise_volume = 'pactl set-sink-mute 0 0 && pactl set-sink-volume 0 65536';
+exports.raise_volume = 'pactl set-sink-mute @DEFAULT_SINK@ 0&&pactl set-sink-volume @DEFAULT_SINK@ 100%';