[Devil-linux-commit] build update_src,1.16.2.2,1.16.2.3

[<fr...@us...>]

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv30248

Modified Files:
      Tag: rel-1-0-patches
	update_src 
Log Message:
backport from 1.1.x

Index: update_src
===================================================================
RCS file: /cvsroot/devil-linux/build/update_src,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- update_src	14 Jan 2004 04:50:45 -0000	1.16.2.2
+++ update_src	14 Jan 2004 20:26:20 -0000	1.16.2.3
@@ -13,52 +13,77 @@
 # the array holding the directory on the specific ftp server
 declare -a ftpd
 
-menu[1]="Devil-Linux FTP-Server   Frankfurt (M)/Germany"
+#
+# menu[x]="DESCRIPTIOM"
+# ftps[x]="ftp.domain.invalid"         - the hostname of the ftp mirror server
+# ftpd[x]="/...../sources/$VERSION/"   - path to the sources
+#
+
+# the main server
+
+menu[1]="Devil-Linux FTP-Server       Frankfurt (M)/Germany"
 ftps[1]="ftp.devil-linux.org"
 ftpd[1]="/pub/devel/sources/$VERSION/"
 
-menu[2]="University of Technology Lille/France - official mirror"
+
+# the official mirrors
+
+menu[2]="University of Technology     Lille/France"
 ftps[2]="ftp.univ-lille1.fr"
 ftpd[2]="/pub/os/linux/distributions/devil-linux/devel/sources/$VERSION/"
 
-menu[3]="University of Technology Graz/Austria - official mirror"
+menu[3]="University of Technology     Graz/Austria"
 ftps[3]="ftp.tu-graz.ac.at"
 ftpd[3]="/pub/mirror/devil-linux/devel/sources/$VERSION/"
 
-menu[4]="Semmelweis Univ Med School Budapest/Hungary - official mirror"
+menu[4]="Semmelweis Univ Med School   Budapest/Hungary"
 ftps[4]="xenia.sote.hu"
 ftpd[4]="/pub/mirrors/devil-linux/devel/sources/$VERSION/"
 
-menu[5]="Heiko @ home - internal mirror"
-ftps[5]="192.168.0.2"
-ftpd[5]="/ftp.devil-linux.org/devel/sources/$VERSION/"
 
-menu[6]="University of Technology Graz/Austria - internal mirror"
-ftps[6]="ftp.vc-graz.ac.at"
-ftpd[6]="/pub/mirror/devil-linux/devel/sources/$VERSION/"
+# the internal mirrors (mostly used by specific developers)
+
+menu[97]="University of Technology     Graz/Austria"
+ftps[97]="ftp.vc-graz.ac.at"
+ftpd[97]="/pub/mirror/devil-linux/devel/sources/$VERSION/"
+
+menu[98]="Heiko @ home"
+ftps[98]="192.168.0.2"
+ftpd[98]="/ftp.devil-linux.org/devel/sources/$VERSION/"
+
+menu[99]="BS @ work"
+ftps[99]="172.16.2.1"
+ftpd[99]="/"
+
+maxindex=99
 
 function menu () {
 	local menuitems=${#menu[@]} # number of menuitems
-
+	
 	ret=255
 	while [ $ret -eq 255 ]; do
 		
 		echo
-		echo "Note: when starting to pull the sources for the first"
-		echo "      time try to use a mirror and then call update_src"
-		echo "      a second time this time using the main server to"
-		echo "      just get the latest source updates"
+		echo "Note:  When downloading the sources for the first time,"
+		echo "       use a mirror, then call update_src a second time"
+		echo "       using the main server to get the latest updates."
 		echo
-		echo "The list of devil linux mirrors:"
-		for ((i=1; $i - $menuitems - 1; i++)); do
-			echo " ($i) ${menu[$i]}"
+		echo " Devil-Linux main download site:"
+		for ((i=1, j=1; i <= menuitems; i++, j++)); do
+			if [ $i = $j -a "${#menu[$i]}" -eq 0 ]; then
+				let j=$maxindex-$menuitems+$i
+				echo " Internal mirrors:"
+			fi
+			[ $i = 2 ] && echo " Official Devil-Linux mirror download sites:"
+			[ $j -lt 10 ] && echo -n " "
+			echo "  ($j) ${menu[$j]}"
 		done
 		
 		echo
 		echo -n "Please select one from the list above or (e)xit [1]: "
 		read input
 		
-		test -n "$input" -a $input -gt 0 -a $input -le $menuitems 2>/dev/null &&
+		test -n "$input" -a $input -gt 0 -a "${#menu[$input]}" -ne 0 2>/dev/null &&
 			ret=$input
 		test -n "$input" -a \( "$input" = "e" -o "$input" = "E" \) 2>/dev/null &&
 			ret=0