diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-22 13:59:02 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-22 13:59:02 +0400 |
| commit | 248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb (patch) | |
| tree | b806f9b9e0d89d6e6631ecf54a21b2f64be4a03f /pkgs/build-support/upstream-updater | |
| parent | 1797d396ab9355370b4b3c8113203d6532555961 (diff) | |
| download | nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar.gz nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar.bz2 nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar.lz nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar.xz nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.tar.zst nixpkgs-248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb.zip | |
Update-walker should use basename of .upstream file for default basename of .nix
Diffstat (limited to 'pkgs/build-support/upstream-updater')
| -rwxr-xr-x | pkgs/build-support/upstream-updater/update-walker.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index b8621616169..3935f2a43ed 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -88,7 +88,7 @@ ensure_version () { ensure_target () { echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2 - [ -z "$CURRENT_TARGET" ] && target default.nix + [ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix" } ensure_name () { @@ -227,8 +227,9 @@ do_overwrite () { process_config () { CONFIG_DIR="$(directory_of "$1")" + CONFIG_NAME="$(basename "$1")" BEGIN_EXPRESSION='# Generated upstream information'; - source "$CONFIG_DIR/$(basename "$1")" + source "$CONFIG_DIR/$CONFIG_NAME" ensure_name ensure_attribute_name retrieve_version |