Changeset 932 in MondoRescue for trunk/tools/pkg2ftp

Timestamp:

Nov 15, 2006, 12:40:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

File:

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

trunk/tools/pkg2ftp

@@ -37 +37 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -52 +52 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
+    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
     if [  _"$dtype" = _"rpm" ]; then
         if [ _"$p" = _"mondo-doc" ]; then
@@ -58 +59 @@
             ar=$ARCH
         fi
-        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
+        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${tag}${suf}.${ar}.rpm"
+        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
     elif [  _"$dtype" = "_deb" ]; then
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"