afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: changes usage of running scripts using /bin/sh to bash to help provide consistency in what could be ran, added bash as a dependency in installation scripts, added bash as an executable check during startup

Browse source
This commit is contained in:
Blake Harnden 2020-07-28 16:13:37 -07:00
parent eb70386238
commit 0d2dd70727
20 changed files with 71 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/nodes/client.py
View file

@ -5,7 +5,7 @@ The control channel can be accessed via calls using the vcmd shell.
"""
from core import utils
from core.executables import VCMD
from core.executables import BASH, VCMD
class VnodeClient:
@ -49,7 +49,9 @@ class VnodeClient:
"""
pass
def create_cmd(self, args: str) -> str:
def create_cmd(self, args: str, shell: bool = False) -> str:
if shell:
args = f'{BASH} -c "{args}"'
return f"{VCMD} -c {self.ctrlchnlname} -- {args}"
def check_cmd(self, args: str, wait: bool = True, shell: bool = False) -> str:
@ -63,5 +65,5 @@ class VnodeClient:
:raises core.CoreCommandError: when there is a non-zero exit status
"""
self._verify_connection()
args = self.create_cmd(args)
args = self.create_cmd(args, shell)
return utils.cmd(args, wait=wait, shell=shell)