diff --git a/terminatorlib/cwd.py b/terminatorlib/cwd.py index f8fcb175..1f578186 100644 --- a/terminatorlib/cwd.py +++ b/terminatorlib/cwd.py @@ -25,12 +25,11 @@ def get_default_cwd(): """Determine a reasonable default cwd""" - cwd = os.getcwd() - if not os.path.exists(cwd) or not os.path.isdir(cwd): - try: - cwd = pwd.getpwuid(os.getuid())[5] - except KeyError: - cwd = '/' + try: + cwd = os.getcwd() + except (FileNotFoundError,OSError): + err("unable to set current working directory, does not exist") + cwd = '/' return(cwd)