From a15e083372a19aaa04b4a8ce4c36be52295bfe42 Mon Sep 17 00:00:00 2001 From: José Romildo Date: Fri, 30 Sep 2022 09:59:29 -0300 Subject: httpTwoLevelsUpdater: fix variable default value --- pkgs/common-updater/http-two-levels-updater.nix | 2 +- pkgs/common-updater/scripts/list-archive-two-levels-versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/common-updater/http-two-levels-updater.nix b/pkgs/common-updater/http-two-levels-updater.nix index 8ece1161015..4656163c18a 100644 --- a/pkgs/common-updater/http-two-levels-updater.nix +++ b/pkgs/common-updater/http-two-levels-updater.nix @@ -15,5 +15,5 @@ genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${url}"}"; + versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; } diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/common-updater/scripts/list-archive-two-levels-versions index 11db08ad07b..e7c02ed90b0 100755 --- a/pkgs/common-updater/scripts/list-archive-two-levels-versions +++ b/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -4,7 +4,7 @@ pname="" # package name attr_path="" # package attribute path -url="" # directory list url +url="" # directory listing url file="" # file for writing debugging information while (( $# > 0 )); do @@ -31,7 +31,7 @@ while (( $# > 0 )); do done if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_NAME" + pname="$UPDATE_NIX_PNAME" fi if [[ -z "$attr_path" ]]; then -- cgit 1.4.1