Author: raskin Date: 2010-06-23 04:58:07 +0000 (Wed, 23 Jun 2010) New Revision: 22390
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22390&view=rev Modified: nixpkgs/trunk/pkgs/build-support/upstream-updater/snippets.sh nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh Log: Use an SF version extractor with better chances to yield correct result by default Changes: Modified: nixpkgs/trunk/pkgs/build-support/upstream-updater/snippets.sh =================================================================== --- nixpkgs/trunk/pkgs/build-support/upstream-updater/snippets.sh 2010-06-23 04:50:03 UTC (rev 22389) +++ nixpkgs/trunk/pkgs/build-support/upstream-updater/snippets.sh 2010-06-23 04:58:07 UTC (rev 22390) @@ -4,6 +4,7 @@ #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz skipRedirectSF='[email protected]/[email protected]/project@; s@/files@@; s@/download$@@;' extractReleaseSF='s...@.*/([^/]+)/[^/]...@\1@' +extractVersionSF='s...@.*/[^/0-9]*([0-9].*)[.](tar|tgz|tbz2|zip)....@\1@' apacheMirror='s...@http://www.apache.org/dist/@mirror://apache/@' skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@' Modified: nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh =================================================================== --- nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh 2010-06-23 04:50:03 UTC (rev 22389) +++ nixpkgs/trunk/pkgs/build-support/upstream-updater/update-upstream-data.sh 2010-06-23 04:58:07 UTC (rev 22390) @@ -56,8 +56,8 @@ echo "Sourceforge-corrected URL: $freshUrl" >&2 version="$(echo "$freshUrl" | - sed -re "$extractReleaseSF")" - baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's...@.*/projects/([^/]+)/....@\1@')")" + sed -re "$extractVersionSF")" + baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's...@.*/project/([^/]+)/....@\1@')")" url="$freshUrl" name="$baseName-$version" advertisedUrl="$freshUrl" _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
