diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
| commit | a615d19df88eb2e989316b480519161945dbc7dc (patch) | |
| tree | 369970b98042998b86c11024598155e037b76fec /redhat/build/rpmdist.sh | |
| parent | 76a93e0011ade1583a1ec672f33411dfd35454f3 (diff) | |
| download | tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip | |
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/build/rpmdist.sh')
| -rwxr-xr-x | redhat/build/rpmdist.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 72ccbf453..f890bfb2e 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 ] || [ -r /etc/SUSE-brand ] || grep -q "opensuse" "/etc/os-release"; then a="opensuse" fi @@ -39,10 +39,19 @@ 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)" + elif [ -r "/etc/SUSE-brand" ]; then + DIST=".oss$((read a; read a b c; echo ${c//./}) </etc/SUSE-brand)" + elif grep -q "tumbleweed" "/etc/os-release"; then + DIST=".osstw" + else + DIST=".oss" + fi ;; # PCLinuxOS PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";; + #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";; *) echo "distrib non reconnue !! $a";; esac |