diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-08 13:05:43 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-08 13:05:43 +0400 |
commit | d3e5b8feeea29e91b784023432832b5b68514035 (patch) | |
tree | 5412648805e909e1eb91ece542e65a7e36623263 /pkgs/build-support/upstream-updater | |
parent | a9edaf10ed7570f66f17130c82a4e4170e80bfbb (diff) |
Fix dummy pseudo-updates being found for some packages
Diffstat (limited to 'pkgs/build-support/upstream-updater')
-rwxr-xr-x | pkgs/build-support/upstream-updater/update-walker.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index 8d7a6b219f16..b86216161690 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -97,6 +97,12 @@ ensure_name () { echo "Resulting name: $CURRENT_NAME" } +ensure_attribute_name () { + echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2 + [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME" + echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME" +} + ensure_choice () { echo "Ensuring that choice is made." >&2 echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2 @@ -127,8 +133,13 @@ name () { echo "CURRENT_NAME: $CURRENT_NAME" >&2 } +attribute_name () { + CURRENT_ATTRIBUTE_NAME="$1" + echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2 +} + retrieve_version () { - PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_NAME".meta.version | xargs)" + PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta.version | xargs)" } directory_of () { @@ -159,7 +170,7 @@ do_write_expression () { echo "${1}rec {" echo "${1} baseName=\"$CURRENT_NAME\";" echo "${1} version=\"$CURRENT_VERSION\";" - echo "${1} name=\"$CURRENT_NAME-$CURRENT_VERSION\";" + echo "${1} name=\"\${baseName}-\${version}\";" echo "${1} hash=\"$CURRENT_HASH\";" echo "${1} url=\"$CURRENT_URL\";" echo "${1} sha256=\"$CURRENT_HASH\";" @@ -219,6 +230,7 @@ process_config () { BEGIN_EXPRESSION='# Generated upstream information'; source "$CONFIG_DIR/$(basename "$1")" ensure_name + ensure_attribute_name retrieve_version ensure_choice ensure_version |