git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/build
[build.git]
/
build.common
diff --git
a/build.common
b/build.common
index
b248986
..
350f662
100644
(file)
--- 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
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 ;;
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
;;
[Ss]L*)
releasename=sl$release
;;
- squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy)
+ squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy
|trusty
)
releasename=$distro
;;
*)
releasename=$distro
;;
*)