Pref vars to uppercase (Pythonic constants)

This commit is contained in:
5bentz 2018-03-25 18:01:46 +02:00
parent ac4b33830a
commit b3ce9e77dd

View File

@ -13,15 +13,15 @@ VERSION = "_VERSIONHOLDER_"
######################## Begin preferences section #############################
################################################################################
# Default command for MacOS:
#command = "/usr/local/bin/pass"
command = "/usr/bin/pass"
commandArgs = []
commandEnv = {
#COMMAND = "/usr/local/bin/pass"
COMMAND = "/usr/bin/pass"
COMMAND_ARGS = []
COMMAND_ENV = {
"TREE_CHARSET": "ISO-8859-1",
# Default PATH for MacOS:
#"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
}
charset = "UTF-8"
CHARSET = "UTF-8"
################################################################################
######################### End preferences section ##############################
################################################################################
@ -69,19 +69,19 @@ if __name__ == "__main__":
key = receivedMessage[0]
key = "/" + (key[1:] if key[0] == "/" else key)
pos_args = [key]
opt_args += commandArgs
opt_args += COMMAND_ARGS
# Set up (modified) command environment
env = dict(os.environ)
if "HOME" not in env:
env["HOME"] = os.path.expanduser('~')
for key, val in commandEnv.items():
for key, val in COMMAND_ENV.items():
env[key] = val
# Set up subprocess params
cmd = [command] + opt_args + ['--'] + pos_args
cmd = [COMMAND] + opt_args + ['--'] + pos_args
proc_params = {
'input': bytes(std_input, charset) if std_input else None,
'input': bytes(std_input, CHARSET) if std_input else None,
'stdout': subprocess.PIPE,
'stderr': subprocess.PIPE,
'env': env
@ -93,7 +93,7 @@ if __name__ == "__main__":
# Send response
sendMessage(encodeMessage({
"exitCode": proc.returncode,
"stdout": proc.stdout.decode(charset),
"stderr": proc.stderr.decode(charset),
"stdout": proc.stdout.decode(CHARSET),
"stderr": proc.stderr.decode(CHARSET),
"version": VERSION
}))