Fixed regex

mikeknight85 · Nov 22, 2021 · 567e252 · 567e252
1 parent af2c708
commit 567e252
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Logitech/Logi_Options.download.recipe.yaml b/Logitech/Logi_Options.download.recipe.yaml
@@ -8,7 +8,7 @@ Input:
 Process:
 - Processor: URLTextSearcher
   Arguments:
-    re_pattern: https://download01.logi.com/web/ftp/pub/techsupport/options/Options_[0-9\.]*.zip
+    re_pattern: '(?P<url>(https:\/\/www\.|https:\/\/)?[a-z0-9\/\.]+(options[a-z0-9\_\.]+zip))'
     result_output_var_name: url
     url: https://www.logitech.com/product/options
 
@@ -35,3 +35,4 @@ Process:
     - Developer ID Certification Authority
     - Apple Root CA
     input_path: '%found_filename%'
+    INSTALLER_PKG: '%found_filename%'
diff --git a/Logitech/Logi_Options.pkg.recipe.yaml b/Logitech/Logi_Options.pkg.recipe.yaml
@@ -17,14 +17,10 @@ Process:
     input_plist_path: '%found_filename%'
     plist_version_key: CFBundleShortVersionString
 
-- Processor: FileFinder
-  Arguments:
-    pattern: '%RECIPE_CACHE_DIR%/unpack/LogiMgr Installer*.app/Contents/Resources/LogiMgr.pkg'
-
 - Processor: PkgCopier
   Arguments:
     pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg'
-    source_pkg: '%found_filename%'
+    source_pkg: '%INSTALLER_PKG%'
 
 - Processor: PathDeleter
   Arguments:

diff --git a/Xray Exploratory App/Xray_Exploratory_App.download.recipe.yaml b/Xray Exploratory App/Xray_Exploratory_App.download.recipe.yaml
@@ -12,6 +12,7 @@ Process:
     re_pattern: '[^\/]\.\d\.\d(?=\+)'
     url: https://docs.getxray.app/display/XEA/Release+Notes
     result_output_var_name: version
+
 - Processor: URLDownloader
   Arguments:
     filename: 'xea.dmg'