From 4e2a55651dbebc7361e6565d249c0900d38976c1 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 12 Sep 2023 11:48:45 -0700
Subject: [PATCH 1/2] Allow run_command to run as user

---
 .pylintrc         |  2 +-
 adafruit_shell.py | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 40208c3..f945e92 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -396,4 +396,4 @@ min-public-methods=1
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception
diff --git a/adafruit_shell.py b/adafruit_shell.py
index 681af4f..e8aae5e 100644
--- a/adafruit_shell.py
+++ b/adafruit_shell.py
@@ -29,6 +29,7 @@ import fcntl
 import platform
 import fileinput
 import re
+import pwd
 from datetime import datetime
 from clint.textui import colored, prompt
 import adafruit_platformdetect
@@ -65,7 +66,9 @@ class Shell:
             )
         return prompt.options(message, options)
 
-    def run_command(self, cmd, suppress_message=False, return_output=False):
+    def run_command(
+        self, cmd, suppress_message=False, return_output=False, run_as_user=None
+    ):
         """
         Run a shell command and show the output as it runs
         """
@@ -79,13 +82,31 @@ class Shell:
             except TypeError:
                 return ""
 
+        # Allow running as a different user if we are root
+        if self.is_root() and run_as_user is not None:
+            pw_record = pwd.getpwnam(run_as_user)
+            env = os.environ.copy()
+            env["HOME"] = pw_record.pw_dir
+            env["LOGNAME"] = run_as_user
+            env["USER"] = pw_record.pw_name
+
+            def preexec():
+                os.setgid(pw_record.pw_gid)
+                os.setuid(pw_record.pw_uid)
+
+        else:
+            env = None
+            preexec = None
+
         full_output = ""
-        with subprocess.Popen(
+        with subprocess.Popen(  # pylint: disable=subprocess-popen-preexec-fn
             cmd,
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
+            env=env,
+            preexec_fn=preexec,
         ) as proc:
             while proc.poll() is None:
                 err = read_stream(proc.stderr)

From 3ede731b6c55eaf4a1ddbac505ca5af47822f16d Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 12 Sep 2023 14:46:15 -0700
Subject: [PATCH 2/2] Improve error message

---
 adafruit_shell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adafruit_shell.py b/adafruit_shell.py
index f85e039..23c0f50 100644
--- a/adafruit_shell.py
+++ b/adafruit_shell.py
@@ -224,9 +224,9 @@ class Shell:
         #    directory = self.getcwd() + "/" + directory
         directory = self.path(directory)
         if not self.exists(directory):
-            raise ValueError("Directory does not exist")
+            raise ValueError(f"Directory '{directory}' does not exist")
         if not self.isdir(directory):
-            raise ValueError("Given location is not a directory")
+            raise ValueError(f"The given location '{directory}' is not a directory")
         os.chdir(directory)
 
     def pushd(self, directory):