X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=350f662c12e9d00a9f887736de67eef5a7993fcd;hb=748aa975db3bd5025d746576654a6f92fde0baf2;hp=f43cb493c1567a3bb2d8887c6e703ca440924f55;hpb=967e448feef5a2ec1434d67eb5f6ff211ea9ba56;p=build.git diff --git a/build.common b/build.common index f43cb493..350f662c 100644 --- a/build.common +++ b/build.common @@ -20,12 +20,13 @@ 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 ;; 7.*) distro=wheezy ;; - 8.*) distro=jessie ;; + # might be that I'm getting 'jessie'sid' just because it's still testing.. + 8.*|jessie*) distro=jessie ;; *) distro=unknown.debian.in.build.common ;; esac fi @@ -65,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) releasename=$distro ;; *) @@ -572,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 "$@" ; } ##############################