X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=7a09d86f6266d7bf2ee2dfd5c0f42eae6ea629ee;hb=5424fcc13b7bd8492ffa01a62fbd53c456ad1fa6;hp=51cb0d0f38532776eda8832b28b4d3c0a978d68b;hpb=04f205641f9f2518603b28127b978494a1608390;p=build.git diff --git a/build.common b/build.common index 51cb0d0f..7a09d86f 100644 --- a/build.common +++ b/build.common @@ -20,7 +20,7 @@ function pl_getDistro() { case $distro in Scientific*) distro="SL" ; esac elif [ -f /etc/lsb-release ] ; then . /etc/lsb-release - echo $DISTRIB_CODENAME + distro=$DISTRIB_CODENAME elif [ -f /etc/debian_version ] ; then case $(cat /etc/debian_version) in 6.*) distro=squeeze ;; @@ -66,7 +66,7 @@ function pl_getReleaseName () { [Ss]L*) releasename=sl$release ;; - squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy) + squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic) releasename=$distro ;; *) @@ -573,6 +573,8 @@ function pl_parsePkgs () { # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s] function pl_getPackages() { pl_parsePkgs package "$@" ; } function pl_getGroups() { pl_parsePkgs group "$@" ; } +function pl_getPips() { pl_parsePkgs pip "$@" ; } +function pl_getGems() { pl_parsePkgs gem "$@" ; } ##############################