micropython
diff --git a/‎tools/mpremote/mpremote/main.py
Lines changed: 13 additions & 15 deletions b/‎tools/mpremote/mpremote/main.py
Lines changed: 13 additions & 15 deletions
@@ -319,35 +319,34 @@ def argparse_none(description):
     "--version": "version",
 }
 
-# Add "a0", "a1", ..., "u0", "u1", ..., "c0", "c1", ... as aliases
+# Add "a0", "a1", ..., "u0", "u1", ..., "c1", "c2", ... as aliases
 # for "connect /dev/ttyACMn" (and /dev/ttyUSBn, COMn) etc.
 for port_num in range(4):
     for prefix, port in [("a", "/dev/ttyACM"), ("u", "/dev/ttyUSB"), ("c", "COM")]:
-        _BUILTIN_COMMAND_EXPANSIONS["{}{}".format(prefix, port_num)] = {
-            "command": "connect {}{}".format(port, port_num),
-            "help": 'connect to serial port "{}{}"'.format(port, port_num),
+        if port_num == 0 and port == "COM":
+            continue  # skip COM0 as it does not exist
+        _BUILTIN_COMMAND_EXPANSIONS[f"{prefix}{port_num}"] = {
+            "command": f"connect {port}{port_num}",
+            "help": f'connect to serial port "{port}{port_num}"',
         }
 
 
 def load_user_config():
     # Create empty config object.
     config = __build_class__(lambda: None, "Config")()
     config.commands = {}
-    # use $XDG_CONFIG_HOME, if on Windows use $APPDATA
+    # Get config file name.
     if os.name != "nt":
-        # Get config file name.
-        path = os.getenv("XDG_CONFIG_HOME")
+        path = os.getenv("XDG_CONFIG_HOME") or os.getenv("HOME")
         if path is None:
-            path = os.getenv("HOME")
-            if path is None:
-                return config
-            path = os.path.join(path, ".config")
-        path = os.path.join(path, _PROG)
+            return config
+        path = os.path.join(path, ".config")
     else:
-        path = os.getenv("APPDATA")
+        # HOME might be used by MSYS2, but APPDATA is the standard on Windows.
+        path = os.getenv("HOME") or os.getenv("APPDATA")
         if path is None:
             return config
-        path = os.path.join(path, _PROG)
+    path = os.path.join(path, _PROG)
     config_file = os.path.join(path, "config.py")
     # Check if config file exists.
     if not os.path.exists(config_file):
@@ -363,7 +362,6 @@ def load_user_config():
     config.__dict__["__file__"] = config_file
     exec(config_data, config.__dict__)
     os.chdir(prev_cwd)
-
     return config