admin (AC-branch): ftp/geniso-mini - detect old poldek - small cle...

[hawk]

Author: hawk                         Date: Sun Mar 12 21:53:38 2006 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- detect old poldek
- small cleanup

---- Files affected:
admin/ftp:
   geniso-mini (1.20.2.2 -> 1.20.2.3) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20.2.2 admin/ftp/geniso-mini:1.20.2.3
--- admin/ftp/geniso-mini:1.20.2.2	Sun Feb 19 23:31:01 2006
+++ admin/ftp/geniso-mini	Sun Mar 12 22:53:33 2006
@@ -7,12 +7,11 @@
 ROOT="/pld/ftp"
 PATH=$ROOT/.stat/bin:$PATH; export PATH
 
-#ARCHLIST="athlon i386 i586 i686"
-ARCHLIST="i386"
+ARCHLIST="i386 i586 i686 athlon"
 
 DIST="2.0"
 
-DATA="20060219"
+DATA="20060312"
 
 MKISOFSOPT="-quiet"
 
@@ -22,8 +21,8 @@
 
 ISOTARGET="/pld/ftp"
 
-POLDEK="/usr/bin/poldek"
 #POLDEK=$ROOT/.stat/bin/poldek-$DIST
+POLDEK="/usr/bin/poldek"
 
 MKISOFS="/usr/bin/mkisofs"
 
@@ -31,6 +30,11 @@
 NAME="Ac"
 SUBVER="RC1"
 
+POLDEK_OLD=
+if ($POLDEK --version | grep -qE '0\.18\.'); then
+  POLDEK_OLD="yes"
+fi
+
 pld_info() {
 echo "
 *************************************************************
@@ -98,7 +102,11 @@
     done
     set -x
     
-    $POLDEK -s $T/PLD/RPMS --mkidxz --mt=pdir
+    if [ "$POLDEK_OLD" = "yes" ]; then
+    	$POLDEK -s $T/PLD/RPMS --mkidxz
+    else
+    	$POLDEK -s $T/PLD/RPMS --mkidxz --mt=pdir
+    fi
 
     # please don't change it. installer relayes on presence of this
     # file in cd image root
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20.2.2&r2=1.20.2.3&f=u