diff --git a/src/scripts/treemacs-count-mail.py b/src/scripts/treemacs-count-mail.py index 618dad9a..cab7c841 100644 --- a/src/scripts/treemacs-count-mail.py +++ b/src/scripts/treemacs-count-mail.py @@ -32,7 +32,8 @@ def main(): shell=True, stdout=PIPE, bufsize=100, - encoding='utf-8' + encoding='utf-8', + env={"LC_ALL": "C"} ).communicate()[0][:-1] if unread == "0": diff --git a/src/scripts/treemacs-find-ignored-files.py b/src/scripts/treemacs-find-ignored-files.py index 4cd0c2c6..1a8a7016 100644 --- a/src/scripts/treemacs-find-ignored-files.py +++ b/src/scripts/treemacs-find-ignored-files.py @@ -37,7 +37,7 @@ def main(): for root in roots: if exists(root + "/.git"): - proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, cwd=root) + proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, cwd=root, env={"LC_ALL": "C"}) procs.append((root, proc)) STDOUT.write(b"(") diff --git a/src/scripts/treemacs-git-commit-diff.py b/src/scripts/treemacs-git-commit-diff.py index 4b050088..05b6efd3 100644 --- a/src/scripts/treemacs-git-commit-diff.py +++ b/src/scripts/treemacs-git-commit-diff.py @@ -5,7 +5,7 @@ STATUS_CMD = "{} status -sb".format(GIT_BIN) def main(): - proc = Popen(STATUS_CMD, shell=True, stdout=PIPE, bufsize=100) + proc = Popen(STATUS_CMD, shell=True, stdout=PIPE, bufsize=100, env={"LC_ALL": "C"}) if (proc.wait() != 0): sys.exit(2) diff --git a/src/scripts/treemacs-git-status.py b/src/scripts/treemacs-git-status.py index 87e67661..e0c2ef1f 100644 --- a/src/scripts/treemacs-git-status.py +++ b/src/scripts/treemacs-git-status.py @@ -1,5 +1,5 @@ from subprocess import Popen, PIPE -from os import listdir, environ +from os import listdir from os.path import isdir, islink from posixpath import join import sys @@ -54,8 +54,7 @@ def find_recursive_entries(path, state): def main(): global output, ht_size # Don't lock Git when updating status. - environ["GIT_OPTIONAL_LOCKS"] = "0" - proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100) + proc = Popen(GIT_CMD, shell=True, stdout=PIPE, bufsize=100, env={"LC_ALL": "C", "GIT_OPTIONAL_LOCKS": "0"}) dirs_added = {} for item in proc.stdout: diff --git a/src/scripts/treemacs-single-file-git-status.py b/src/scripts/treemacs-single-file-git-status.py index a441384b..2eb8e0e7 100644 --- a/src/scripts/treemacs-single-file-git-status.py +++ b/src/scripts/treemacs-single-file-git-status.py @@ -90,14 +90,14 @@ def main(): print(elisp_alist) def add_git_processes(status_listings, path): - ignored_proc = Popen(IS_IGNORED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL) - tracked_proc = Popen(IS_TRACKED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL) - changed_proc = Popen(IS_CHANGED_CMD + path, shell=True, stdout=PIPE, stderr=DEVNULL) + ignored_proc = Popen(IS_IGNORED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL, env={"LC_ALL": "C"}) + tracked_proc = Popen(IS_TRACKED_CMD + path, shell=True, stdout=DEVNULL, stderr=DEVNULL, env={"LC_ALL": "C"}) + changed_proc = Popen(IS_CHANGED_CMD + path, shell=True, stdout=PIPE, stderr=DEVNULL, env={"LC_ALL": "C"}) status_listings.append((path, ignored_proc, tracked_proc, changed_proc)) def determine_file_git_state(): - proc = Popen(FILE_STATE_CMD + FILE, shell=True, stdout=PIPE, stderr=DEVNULL) + proc = Popen(FILE_STATE_CMD + FILE, shell=True, stdout=PIPE, stderr=DEVNULL, env={"LC_ALL": "C"}) line = proc.stdout.readline() if line: state = line.lstrip().split(b" ")[0]