Removing semi-colon to rectify system tasks

This commit is contained in:
James Barnsley
2019-04-10 16:33:41 +12:00
parent 5aa74ca3a2
commit cb015fd263
2 changed files with 10 additions and 8 deletions

View File

@ -33,7 +33,7 @@ class IrisSystemThread(Thread):
return
# Run the actual task (this is the process-blocking instruction)
output = subprocess.check_output(["sudo -n "+self.path+"/system.sh "+self.action], shell=True)
output = subprocess.check_output(["sudo "+self.path+"/system.sh "+self.action], shell=True)
# And then, when complete, return to our callback
if self.callback:
@ -51,10 +51,12 @@ class IrisSystemThread(Thread):
def can_run(self, *args, **kwargs):
# Attempt an empty call to our system file
# If this fails, we can't run any commands this way
try:
subprocess.check_output("sudo -n "+self.path+"/system.sh", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
return True
except Exception, e:
process = subprocess.Popen("sudo -n "+self.path+"/system.sh", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
result, error = process.communicate()
exitCode = process.wait()
# Some kind of failure, so we can't run any commands this way
if exitCode > 0:
raise Exception("Password-less access to "+self.path+"/system.sh was refused. Check your /etc/sudoers file.")
return False
else:
return True

View File

@ -22,7 +22,7 @@ elif [[ $1 = "test" ]]; then
TEST="$(echo 'Hello, this is your bash speaking. I was sleeping for 3 seconds.')"
echo -e "${TEST}"
else;
else
echo -e "Unsupported system task"
fi