Fix build and Renovate regex

felipecrs · Mar 4, 2024 · c0c8d22 · c0c8d22
1 parent 1b10c0c
commit c0c8d22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/renovate.json b/renovate.json
@@ -14,7 +14,7 @@
       "customType": "regex",
       "fileMatch": ["^Dockerfile$", "^scripts/prepare_image.sh$"],
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV|ARG)? .+?_VERSION[ =]\"?(?<currentValue>.+?)\"?\\s"
+        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV |ARG )?.+?_VERSION[ =]\"?(?<currentValue>.+?)\"?\\s"
       ]
     }
   ]

diff --git a/scripts/prepare_image.sh b/scripts/prepare_image.sh
@@ -145,8 +145,8 @@ ${CURL} "https://github.com/kadwanev/retry/releases/download/${RETRY_VERSION}/re
 # install pkgx
 # renovate: datasource=github-releases depName=pkgxdev/pkgx
 PKGX_VERSION="1.1.6"
-${CURL} "https://github.com/pkgxdev/pkgx/releases/download/v${PKGX_VERSION}/pkgx-${PKGX_VERSION}+linux+${UNAME_ARCH//_/-}.tar.xz"
-tar -C /usr/local/bin -xJf - pkgx
+${CURL} "https://github.com/pkgxdev/pkgx/releases/download/v${PKGX_VERSION}/pkgx-${PKGX_VERSION}+linux+${UNAME_ARCH//_/-}.tar.xz" |
+    tar -C /usr/local/bin -xJf - pkgx
 
 # install s6-overlay
 # renovate: datasource=github-releases depName=just-containers/s6-overlay