From b39d3c3c768d0515ad749ecc35c0e76ffa5b6e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 12 Sep 2024 11:42:51 +0200 Subject: [PATCH] check: only check npm configuration on default stream The /etc/npmrc is installed only with default stream. --- nodejs22.spec | 2 ++ packaging/nodejs.spec.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nodejs22.spec b/nodejs22.spec index 9c62b6d..58c7af3 100644 --- a/nodejs22.spec +++ b/nodejs22.spec @@ -809,7 +809,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/node-%{nodejs_pkg_ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{nodejs_private_sitelib}/npm/node_modules LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2} # Ensure update-notifier is disabled +%if 0%{?nodejs_default} LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} %{buildroot}%{_bindir}/npm-%{nodejs_pkg_major} --globalconfig=%{buildroot}%{_sysconfdir}/npmrc config list --json | jq -e '.["update-notifier"] == false' +%endif %if 0%{?rhel} && 0%{?rhel} < 8 diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2 index 5a54155..2f055e0 100644 --- a/packaging/nodejs.spec.j2 +++ b/packaging/nodejs.spec.j2 @@ -820,7 +820,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/node-%{nodejs_pkg_ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{nodejs_private_sitelib}/npm/node_modules LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2} # Ensure update-notifier is disabled +%if 0%{?nodejs_default} LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} %{buildroot}%{_bindir}/npm-%{nodejs_pkg_major} --globalconfig=%{buildroot}%{_sysconfdir}/npmrc config list --json | jq -e '.["update-notifier"] == false' +%endif %if 0%{?rhel} && 0%{?rhel} < 8