2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Strip sudo use if running as root on Linux/macOS

Browse source 
* Allows running under live macOS
This commit is contained in:
2Shirt 2020-01-30 13:03:21 -07:00
parent 41130a38ed
commit e1943b9fb4
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/wk/exe.py
View file

@ -3,6 +3,7 @@
import json import json
import logging import logging
import os
import re import re
import subprocess import subprocess
@ -77,6 +78,10 @@ def build_cmd_kwargs(cmd, minimized=False, pipe=True, shell=False, **kwargs):
'shell': shell, 'shell': shell,
} }
# Strip sudo if appropriate
if cmd[0] == 'sudo' and os.name == 'posix' and os.geteuid() == 0:
cmd.pop(0)
# Add additional kwargs if applicable # Add additional kwargs if applicable
for key in 'check cwd encoding errors stderr stdin stdout'.split(): for key in 'check cwd encoding errors stderr stdin stdout'.split():
if key in kwargs: if key in kwargs: