From 89ae98247977c600dee8dddbaec660d7d9059430 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 12 Dec 2022 06:02:26 -0500 Subject: [PATCH] Allow packages with OS-CPU arch strings. --- scripts/update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update.py b/scripts/update.py index 50ad0659..76de1bfb 100644 --- a/scripts/update.py +++ b/scripts/update.py @@ -49,7 +49,7 @@ for plugin_path in plugin_paths: version = manifest['version'] # Extract manifest from .vcvplugin elif plugin_ext == ".vcvplugin": - m = re.match(r'^(.*)-(.*?)-(.*?)$', plugin_basename) + m = re.match(r'^(.*)-(2\..*?)-(.*)$', plugin_basename) if not m: raise Exception(f"Filename {plugin_path} invalid format") slug = m[1] @@ -119,7 +119,7 @@ for plugin_path in plugin_paths: # Update file timestamp common.system(f'touch "{PACKAGES_DIR}/{package_filename}"') # Install Linux package for testing - if arch == 'lin': + if arch == 'lin' or arch == 'lin-x64': common.system(f'cp "{plugin_path}" "{PLUGIN_DIR}/{package_filename}"') # Copy manifest