Changeset 61 in MondoRescue for trunk

Timestamp:

Oct 14, 2005, 3:31:54 PM (19 years ago)

Author:

bcornec

Message:

Trunk: Applying patch r60/2.04_berlios on the build env to the trunk branch as well

Location:

trunk/tools

Files:

• mkdeliv (modified) (1 diff)
• rpm-env (modified) (1 diff)

trunk/tools/mkdeliv

@@ -40 +40 @@
     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
 fi
-scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/TGZ
-scp -p ${rpms} ${SVNAUTH}:${DSTDIR}/RPMS
-scp -p ${srpms} ${SVNAUTH}:${DSTDIR}/SRPMS
+scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/src
+ssh ${SVNAUTH} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
+scp -p ${rpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
+scp -p ${srpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
 ncftpput ${FTPURL} ${tgz}

trunk/tools/rpm-env

@@ -33 +33 @@
 
 if [ -e /etc/mandriva-release ]; then
-        export suf=mdk
+    export ddir="mandriva"
+    export dver=`cat /etc/mandriva-release | awk '{print $4}'`
+    export suf="${dver}mdk"
 elif [ -e /etc/mandrake-release ]; then
-        export suf=mdk
+    export ddir="mandrake"
+    export dver=`cat /etc/mandrake-release | awk '{print $3}'`
+    export suf="${dver}mdk"
+elif [ -e /etc/redhat-release ]; then
+    if [ `grep -q Enterprise /etc/redhat-release` ]; then
+        export ddir="rhel"
+        export dver=`cat /etc/redhat-release | awk '{print $7}'`
+    else
+        export ddir="redhat"
+        export dver=`cat /etc/redhat-release | awk '{print $5}'`
+    fi
+elif [ -e /etc/SuSE-release ]; then
+    export ddir="suse"
+    export dver=`cat /etc/SuSE-release | head -1 | awk '{print $3}'`
 else
-        export suf=""
+    export dver=""
+    export ddir="generic"
 fi
+
+if [ _"$suf" = _"" ]; then
+    export suf="${ddir}${dver}"
+fi