Changeset 1043 in MondoRescue for trunk/tools/pkg2ftp

Timestamp:

Jan 8, 2007, 11:31:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

File:

• trunk/tools/pkg2ftp (modified) (3 diffs)

trunk/tools/pkg2ftp

@@ -10 +10 @@
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
-if [ ${prem} == "/" ]; then
+if [ _${prem} = _"/" ]; then
         export TOOLHOME=$dname
 else
@@ -52 +52 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
+    tar -xz -C $MONDOTMP -f $src $pv/TAG
+    tag=`cat $MONDOTMP/$pv/TAG`
     if [  _"$dtype" = _"rpm" ]; then
         if [ _"$p" = _"mondo-doc" ]; then
@@ -67 +68 @@
         spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
         pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
+    elif [  _"$dfam" = _"slackware" ]; then
+        pkg="$pkg ${TOPBUILDDIR}/build-$p/$pv-*-${tag}mr.tgz"
     fi
 done
 
+rm -rf $MONDOTMP
 echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
-ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
+ssh -q ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver} ; cd ${DSTDIR}/${ddir}/${dver} ; rm -f ${pkg} ${spkg}"
 scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
 ) 2>&1 | tee /tmp/pkg2ftp.log