diff options
author | François Andriot <albator78@libertysurf.fr> | 2016-10-09 14:29:20 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2016-10-09 14:29:20 +0200 |
commit | d7f4f94a48693942cec2d007d3dd8c38d16a772f (patch) | |
tree | 3a8300b670df861125c9b211dcef7b70dbfdf4ed /redhat/build | |
parent | 14b43b6599a0a865d39ec77ddd5a5e76210996db (diff) | |
download | tde-packaging-d7f4f94a48693942cec2d007d3dd8c38d16a772f.tar.gz tde-packaging-d7f4f94a48693942cec2d007d3dd8c38d16a772f.zip |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/build')
-rwxr-xr-x | redhat/build/rpmdist.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 81f077479..ec4735d30 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -7,7 +7,7 @@ DIST="" if [ -r /etc/redhat-release ]; then read a b c d e f g < /etc/redhat-release -elif [ -r /etc/SuSE-release ]; then +elif [ -r /etc/SuSE-release ] || grep -qw "ID=opensuse" "/etc/os-release"; then a="opensuse" fi @@ -39,7 +39,11 @@ case $a in Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";; # Opensuse opensuse) - DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" + if [ -r "/etc/SuSE-release" ]; then + DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" + else + DIST=".oss" + fi ;; # PCLinuxOS PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";; |