summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2016-10-09 14:29:20 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2016-10-09 14:29:20 +0200
commitd7f4f94a48693942cec2d007d3dd8c38d16a772f (patch)
tree3a8300b670df861125c9b211dcef7b70dbfdf4ed
parent14b43b6599a0a865d39ec77ddd5a5e76210996db (diff)
downloadtde-packaging-d7f4f94a48693942cec2d007d3dd8c38d16a772f.tar.gz
tde-packaging-d7f4f94a48693942cec2d007d3dd8c38d16a772f.zip
RPM packaging: update build scripts
-rwxr-xr-xredhat/build/rpmdist.sh8
-rw-r--r--redhat/buildenv.sh2
2 files changed, 7 insertions, 3 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}";;
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 2f82a1a40..4b8e8e92b 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -28,7 +28,7 @@ else
export TDE_COMPRESS=gzip
fi
alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
-alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
+alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
# Build a single package
alias cdp='cd ~/tde/tde-packaging/redhat'