[Frugalware-darcs] setup-current: support for new package name format

[VMiklos]

[support for new package name format
VMiklos <mamajom at axelero.hu>**20050521124315] {
hunk ./src/setup 6
-bindir=/mnt/source/frugalware
-exbindir=/mnt/source/extra/frugalware
+arch=i686
+bindir=/mnt/source/frugalware-$arch
+exbindir=/mnt/source/extra/frugalware-$arch
hunk ./src/setup 148
-	sourcedir=`echo $bindir|sed 's|/frugalware||'`
+	sourcedir=`echo $bindir|sed "s|/frugalware-$arch||"`
hunk ./src/setup 172
-		mkdir -p /mnt/source/frugalware /mnt/source/extra/frugalware
+		mkdir -p /mnt/source/frugalware-$arch /mnt/source/extra/frugalware-$arch
hunk ./src/setup 174
-		lynx -source -dump ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/frugalware/frugalware-current.fdb >/mnt/source/frugalware/frugalware-current.fdb
+		lynx -source -dump ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/frugalware-$arch/frugalware-current.fdb >/mnt/source/frugalware-$arch/frugalware-current.fdb
hunk ./src/setup 176
-		lynx -source -dump ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/extra/frugalware/extra-current.fdb >/mnt/source/extra/frugalware/extra-current.fdb
+		lynx -source -dump ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/extra/frugalware-$arch/extra-current.fdb >/mnt/source/extra/frugalware-$arch/extra-current.fdb
hunk ./src/setup 500
-	sizename=`echo $2|sed 's|.*/\(.*\).fpm|\1|'`
+	sizename=`echo $2|sed "s|.*/\(.*\)-$arch.fpm|\1|"`
hunk ./src/setup 507
-	descname=`echo $2|sed 's|.*/\(.*\).fpm|\1|'`
+	descname=`echo $2|sed "s|.*/\(.*\)-$arch.fpm|\1|"`
hunk ./src/setup 563
-	for i in `ls $exbindir|grep "\-$language"|sed 's/\(.*\)-[0-9].*-[0-9].*fpm/\1/'`
+	for i in `ls $exbindir|grep "\-$language"|sed "s/\(.*\)-[0-9].*-[0-9].*-$arch.fpm/\1/"`
hunk ./src/setup 621
-		echo $i|sed 's/\(.*\)-[0-9].*-[0-9].*fpm/\1/' \
+		echo $i|sed "s/\(.*\)-[0-9].*-[0-9].*-$arch.fpm/\1/" \
}