From d7f4f94a48693942cec2d007d3dd8c38d16a772f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 9 Oct 2016 14:29:20 +0200
Subject: RPM packaging: update build scripts

---
 redhat/build/rpmdist.sh | 8 ++++++--
 redhat/buildenv.sh      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'redhat')

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'
-- 
cgit v1.2.1