CVS: lunar/etc/lunar config,1.6,1.7

[csm at lunar-linux.org]

Update of /var/cvs/lunar/lunar/etc/lunar
In directory dbguin.lunar-linux.org:/tmp/cvs-serv1871/etc/lunar

Modified Files:
	config 
Log Message:
merging theedge into lunar and removing subroutines


Index: config
===================================================================
RCS file: /var/cvs/lunar/lunar/etc/lunar/config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config	15 Mar 2003 18:53:30 -0000	1.6
+++ config	10 Aug 2003 01:16:21 -0000	1.7
@@ -20,7 +20,6 @@
               MOONBASE=/var/lib/lunar/moonbase
              PROTECTED=/var/lib/lunar/protected
                   SOLO=/var/lib/lunar/solo
-           SUBROUTINES=/var/lib/lunar/subroutines
              FUNCTIONS=/var/lib/lunar/functions
                  MENUS=/var/lib/lunar/menu
              SUSTAINED=/var/lib/lunar/sustained
@@ -84,7 +83,9 @@
           XFREE86_URL=ftp://ftp.xfree86.org/pub/XFree86
           LRESORT_URL=http://www.lunar-linux.org/lunar/cache
 
-	 MOONBASE_URL=http://www.lunar-linux.org/lunar/moonbase.tar.bz2
+      MOONBASE_URL[0]=http://www.lunar-linux.org/lunar/moonbase.tar.bz2
+      MOONBASE_URL[1]=http://dk.lunar-linux.org/lunar/moonbase.tar.bz2
+	 
             PATCH_URL=http://www.lunar-linux.org/lunar/patches
 	    
               TRACKED="/bin /boot /etc /lib /sbin /usr /var /opt/lunar"
@@ -120,5 +121,12 @@
 	STANDARD_IFS=" 	
 "
 
-. $SUBROUTINES
-[ -s "$LOCAL_CONFIG" ] && . $LOCAL_CONFIG
+
+for FUNCTION in $FUNCTIONS/*.lunar ; do
+  . $FUNCTION
+done
+
+if [ -s "$LOCAL_CONFIG" ] ; then
+  . $LOCAL_CONFIG
+fi
+