diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-19 03:36:03 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-12-26 20:02:01 +0200 |
commit | 47acd09fdb8e582d7dbb804d3661e65ce32d6c0a (patch) | |
tree | fc6209acced598e2daa15a5bdce7a1ebbda03297 /pkgs/common-updater | |
parent | 0101944621e18096c3f1404654bb43a55861910f (diff) | |
download | nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar.gz nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar.bz2 nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar.lz nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar.xz nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.tar.zst nixpkgs-47acd09fdb8e582d7dbb804d3661e65ce32d6c0a.zip |
update-source-version: Less strict regex for `name = ...` lines
Diffstat (limited to 'pkgs/common-updater')
-rwxr-xr-x | pkgs/common-updater/scripts/update-source-version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 4c4cb56fb32..7a105b67522 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -44,8 +44,8 @@ oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" -elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"[^-]+-$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|" else die "Couldn't figure out where out where to patch in new version in '$attr'!" fi |