1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00

🔨 Fix config.ini URL fetch (#25313)

This commit is contained in:
Darren Garnier 2023-01-30 23:00:49 -05:00 committed by Scott Lahteine
parent b3c004eed9
commit 60f3857662

View File

@ -85,13 +85,12 @@ def apply_opt(name, val, conf=None):
# Return True if any files were fetched. # Return True if any files were fetched.
def fetch_example(url): def fetch_example(url):
if url.endswith("/"): url = url[:-1] if url.endswith("/"): url = url[:-1]
if url.startswith('http'): if not url.startswith('http'):
url = url.replace("%", "%25").replace(" ", "%20")
else:
brch = "bugfix-2.1.x" brch = "bugfix-2.1.x"
if '@' in path: path, brch = map(str.strip, path.split('@')) if '@' in url: url, brch = map(str.strip, url.split('@'))
url = f"https://raw.githubusercontent.com/MarlinFirmware/Configurations/{brch}/config/{url}" url = f"https://raw.githubusercontent.com/MarlinFirmware/Configurations/{brch}/config/{url}"
url = url.replace("%", "%25").replace(" ", "%20")
# Find a suitable fetch command # Find a suitable fetch command
if shutil.which("curl") is not None: if shutil.which("curl") is not None:
fetch = "curl -L -s -S -f -o" fetch = "curl -L -s -S -f -o"