diff options
| author | Christian Rößler | 2013-09-10 17:01:05 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-09-30 13:22:06 +0200 |
| commit | 43c3f1497926407bae8730a7eef4b68feebc239f (patch) | |
| tree | 120ae4f1626d391e6357b4ea72bcc6c423652b06 /helper | |
| parent | [sshd] Disallow ssh login for "demo" user as the password is a little easy to... (diff) | |
| download | tm-scripts-43c3f1497926407bae8730a7eef4b68feebc239f.tar.gz tm-scripts-43c3f1497926407bae8730a7eef4b68feebc239f.tar.xz tm-scripts-43c3f1497926407bae8730a7eef4b68feebc239f.zip | |
[system.inc] now self-detects SYS_DISTRIBUTION as not being reliably sourced.
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/system.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/helper/system.inc b/helper/system.inc index bbab4a40..606ef406 100644 --- a/helper/system.inc +++ b/helper/system.inc @@ -22,10 +22,11 @@ export MAKEFLAGS="-j$CPU_CORES" # Determine if we have lib64 if [ "$(uname -m)x" = "x86_64x" ]; then # Setting LIB64, as openSuse differentiates but Ubuntu does not: + SYS_DISTRIBUTION=$(lsb_release -is | tr '[A-Z]' '[a-z]' | sed -r 's/[^a-z0-9]//g;s/project$//g;s/scientificsl$/scientific/g') case $SYS_DISTRIBUTION in ubuntu | debian) LIB64="lib" ;; opensuse) LIB64="lib64" ;; - *) perror "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown / not set!" ;; + *) pwarning "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" ;; esac AMD64_I386=amd64 X86_64_I586=x86_64 |