[Lunar-commits] CVS: theedge/sbin lget,1.28,1.29 lin,1.89,1.90

[Auke Kok]

Update of /var/cvs/lunar/theedge/sbin
In directory espresso.foo-projects.org:/home/sofar/active/theedge/sbin

Modified Files:
	lget lin 
Log Message:
Mega merge:

* source verification is now a plugin too
* rewrote gpg verification a bit
* removed versioned modules (only one remains: gcc/3.4.3)
* Implemented nested sections: moonbase/gnome/apps is now possible


Index: lget
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lget,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- lget	10 Dec 2004 10:46:33 -0000	1.28
+++ lget	24 Mar 2005 16:38:58 -0000	1.29
@@ -56,17 +56,6 @@
   cd $TMPDIR
   
   MODULES="$@"
-
-  if [ -n "$MOD_VERSION" ] ; then
-    if  [ $(echo $MODULES | wc -w) -gt 1 ] ; then
-      message "${MESSAGE_COLOR} -V|--Version only allowed for single-module install!${DEFAULT_COLOR}"
-      exit 1
-    else
-      MODULES="$MODULES/$MOD_VERSION"
-      message "module = $MODULES"
-    fi
-  fi
-
   if [ -z "$MODULES" ] ; then
     verbose_msg "downloading entire moonbase"
     MODULES=$(list_moonbase | sort)
@@ -114,7 +103,6 @@
       -h|--help    ) help ;                                     exit  1 ;;
       -u|--url     ) export BASE_URL="$2" ;                     shift 2 ;;
       -v|--verbose ) export VERBOSE="on" ;                      shift   ;;
-      -V|--Version ) export MOD_VERSION=$2 ;                    shift 2 ;;
       --) shift ; break ;;
       *) help ; exit ;;
     esac

Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- lin	13 Mar 2005 18:19:12 -0000	1.89
+++ lin	24 Mar 2005 16:38:58 -0000	1.90
@@ -51,7 +51,6 @@
 -R  |  --resurrect              Force to be unpacked from /var/cache/lunar
 -s  |  --silent			Decreases the level of message output
 -v  |  --verbose                Increases the level of message output
--V  |  --Version                Select specific Version of module to install
 -w  |  --want version           Try to install a different version that is
                                 not in moonbase
 EOF
@@ -63,8 +62,6 @@
   debug_msg "main ($@)"
   MODULES="$@"
 
-  verbose_msg "mod_v=\"$MOD_VERSION\" mod=\"$MODULES\""
-
   if echo $MODULES | grep -qw moonbase ; then
     # just update moonbase, no other modules
     if ! get_moonbase ; then
@@ -86,11 +83,6 @@
   # and single modules (plain install)
   if [ -z "$SINGLE_MODULE" ] ; then
 
-    if [ -n "$MOD_VERSION" ] ; then
-      message "${MESSAGE_COLOR} -V|--Version only allowed for single-module install!${DEFAULT_COLOR}"
-      exit 1
-    fi
-
     if [ -z "$TEMP_DOWNLOAD_PIDS" ] ; then
       export TEMP_DOWNLOAD_PIDS=$(temp_create "download-pids")
       export TEMP_PREPAREDDEPS=$(temp_create "prepared-depends")
@@ -162,24 +154,6 @@
     MODULE=$MODULES
     unset RECONFIGURE
 
-    if [ -n "$MOD_VERSION" ] ; then
-      if echo $MODULE | grep -q '/' ; then
-        if [ -d ${MOONBASE}/*/${MODULE} ] ; then
-	  unset MOD_VERSION
-        else
-          message "${PROBLEM_COLOR}No Moonbase module: ${FILE_COLOR}$MODULE${MESSAGE_COLOR} with \"$MODULE\" form, bailing!${DEFAULT_COLOR}"
-	  return 1
-        fi
-      else
-	if [ -d ${MOONBASE}/*/${MODULE}/${MOD_VERSION} ] ; then
-	  MODULE="${MODULE}/${MOD_VERSION}"
-	else
-          debug_msg "${MESSAGE_COLOR}$MODULES Passing ${FILE_COLOR}$MOD_VERSION${MESSAGE_COLOR} to module for processing${DEFAULT_COLOR}"
-        fi
-	message "Module=\"$MODULE\""
-      fi
-    fi
-
     run_details $MODULE &&
     run_depends $MODULE &&
     satisfy_depends $MODULE
@@ -249,7 +223,6 @@
       -R|--resurrect   ) export RESURRECT="$1" ;                    shift   ;;
       -s|--silent      ) export SILENT="$1" ;                       shift   ;;
       -v|--verbose     ) export VERBOSE="on" ;                      shift   ;;
-      -V|--Version     ) export MOD_VERSION=$2 ;                    shift 2 ;;
       -w|--want        ) export WANT_VERSION=$2 ;                   shift 2 ;;
       --) shift ; break ;;
       *) help ; break ;;