[Lunar-commits] <lunar> Merge pull request #31 from cavalier38/lget

[Auke Kok]

commit 96793b0d4d9227ee0b87b73501a5f518bcf694aa
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Wed, 16 Jan 2013 13:24:05 -0800
URL: https://github.com/lunar-linux/lunar/commit/96793b0d4d9227ee0b87b73501a5f518bcf694aa

Merge pull request #31 from cavalier38/lget

Lget issue #19
---
  libs/depends.lunar | +2/-2     
  libs/main.lunar    | +4/-1     
  man/lin.8          | +4/-0     
  prog/lin           | +5/-2     
  4 files changed

--- a/libs/depends.lunar
+++ b/libs/depends.lunar
@@ -303,7 +303,7 @@ satisfy_depends()  {
         if module_exiled $DEP_MODULE ; then
           message "${MODULE_COLOR}${MODULE}:${PROBLEM_COLOR} ! Error: required dependency ${MODULE_COLOR}$DEP_MODULE${DEFAULT_COLOR}${PROBLEM_COLOR} is exiled and cannot be installed${DEFAULT_COLOR}"
           exit 1
-        elif ! SINGLE_MODULE=1 lin $SILENT $COMPILE $DEP_MODULE ; then
+        elif ! SINGLE_MODULE=1 lin $DOWNLOAD_ONLY $SILENT $COMPILE $DEP_MODULE ; then
           exit 1
         fi
       fi
@@ -325,7 +325,7 @@ satisfy_depends()  {
       OPTS="$OPTS $DEP_OFF"
     elif [ "$DEP_STATUS" == "on" ] && ! module_installed $DEP_MODULE && \
         ! module_held $DEP_MODULE ; then
-      if SINGLE_MODULE=1 lin $DEPS_ONLY $SILENT $COMPILE $DEP_MODULE ; then
+      if SINGLE_MODULE=1 lin $DOWNLOAD_ONLY $SILENT $COMPILE $DEP_MODULE ; then
         OPTS="$OPTS $DEP_ON"
       else
         exit 1
--- a/libs/main.lunar
+++ b/libs/main.lunar
@@ -290,8 +290,11 @@ lin_module()  {
     done
   ) &&
 
+  # only download and verify ?
+  if [ -n "$DOWNLOAD_ONLY" ] ; then
+    verify_all_sources $MODULE
   # now entering the physical BUILD stage
-  if ! current_locked && ! solo_locked ; then
+  elif ! current_locked && ! solo_locked ; then
     echo $$ > $linING  &&
     start_logging
 
--- a/man/lin.8
+++ b/man/lin.8
@@ -27,6 +27,10 @@ Enables debug messages, very useful when emailing a bug report.
 .B "\-\-deps"
 Configures the modules and determines their dependencies, but they are not
 compiled or installed.
+.TP
+.B "\-\-download"
+Configures the modules, determines their dependencies and download the sources,
+but they are not compiled or installed.
 .TP 
 .B "-f, \-\-from" directory
 Specify an alternate directory to search for source code tarballs. An alternative
--- a/prog/lin
+++ b/prog/lin
@@ -42,7 +42,9 @@ Optional Parameters:
 
 -c  |  --compile		Ignore $INSTALL_CACHE and compiles
 -d  |  --debug                  Enables debug messages
-       --deps			Configure modules and determine dependencies, 
+       --deps			Configure modules and determine dependencies
+       --download		Configure modules, determine dependencies
+                                and download the sources
 -f  |  --from  directory	Specify an alternate for $SOURCE_CACHE
 -h  |  --help                   Displays this help text
        --opts '--enable-xxx'    Add custom configure options to the module
@@ -238,7 +240,7 @@ main() {
 . /etc/lunar/config
 . $BOOTSTRAP
 
-GETOPT_ARGS=$(getopt -q -n lin -o "cdf:hprRsvV:w:" -l "compile,debug,deps,from:,help,opts:,probe,reconfigure,resurrect,silent,verbose,Version:,want:" -- "$@")
+GETOPT_ARGS=$(getopt -q -n lin -o "cdf:hprRsvV:w:" -l "compile,debug,deps,download,from:,help,opts:,probe,reconfigure,resurrect,silent,verbose,Version:,want:" -- "$@")
 
 # the following trap makes sure all threads exit in case something weird
 # happens:
@@ -260,6 +262,7 @@ else
       -c|--compile     ) export COMPILE="$1" ;                      shift   ;;
       -d|--debug       ) (( LUNAR_DEBUG++ )) ; export LUNAR_DEBUG ; shift   ;;
          --deps        ) export DEPS_ONLY="$1" ;                    shift   ;;
+         --download    ) export DOWNLOAD_ONLY="$1" ;                shift   ;;
       -f|--from        ) export SOURCE_CACHE=$2 ;                   shift 2 ;;
       -h|--help        ) help ; exit                                        ;;
          --opts        ) export PASS_OPTS="$2" ;                    shift 2 ;;