[Frugalware-darcs] setup-current: 0.1.9

VMiklos mamajom at axelero.hu
Thu Mar 16 17:51:24 CET 2006


[0.1.9
VMiklos <mamajom at axelero.hu>**20050401231541] {
hunk ./setup 353
-	echo ") |tail -1 |sed 's/\([0-9\.]*[A-Za-z]\).*/\1/'" >>$categorytempfile
+	echo ") |tail -n 1 |sed 's/\([0-9\.]*[A-Za-z]\).*/\1/'" >>$categorytempfile
hunk ./setup 396
-package_select()
+package_select_install()
hunk ./setup 434
-	selpkg=`cat $whichselected3`
+	allselpkg=`cat $whichselected3`
hunk ./setup 436
+	
+	rm -rf /tmp/pkgcat
+	mkdir -p /tmp/pkgcat
+	for i in $allselpkg
+	do
+		icategory=`grep "/$i-[0-9]" $bindir/../Packages.lst |sed 's|^\(.*\)/.*$|\1|'`
+		echo -n "$i ">>/tmp/pkgcat/$icategory
+		
+	done
+	for i in base apps lib multimedia network
+	do
+		if [ -e /tmp/pkgcat/$i ]; then
+			selpkg=`cat /tmp/pkgcat/$i`
+			install_packages `echo $i|sed 's|.*/\(.*\)$|\1|'` $selpkg
+		fi
+	done
+	#TODO: eject cd, etc
+	for i in x11 xlib xapps kde gnome devel
+	do
+		if [ -e /tmp/pkgcat/$i ]; then
+			selpkg=`cat /tmp/pkgcat/$i`
+			install_packages `echo $i|sed 's|.*/\(.*\)$|\1|'` $selpkg
+		fi
+	done
+	rm -rf /tmp/pkgcat
+	[ -h var/cache/pacman/pkg ] && rm var/cache/pacman/pkg
hunk ./setup 467
+	name=$1
+	shift
hunk ./setup 470
-	info "$instpkg"
+	info "$instpkg ($name $sect)"
hunk ./setup 493
-		info "$doneinstpkg"
+		info "$doneinstpkg ($name $sect)"
hunk ./setup 500
-	[ -h var/cache/pacman/pkg ] && rm var/cache/pacman/pkg
hunk ./setup 559
-package_select $selcat # select packages
-install_packages $selpkg # install packages
+package_select_install $selcat # select and install packages
+# we do'nt call install_packages directly, package_select_install will do that
+# install_packages $selpkg # install packages
hunk ./setup.en 79
+sect="section" #will be displaied like this: Installing packages (base section)
}


More information about the Frugalware-darcs mailing list