Permalink
Browse files

Added --download to lin

--download will run depend checks, downloads and verifies the sources,
but it won't build the modules
fixes #19
  • Loading branch information...
1 parent 108afe4 commit f3eaae07dc0c653d38fee4983a23c486cb0ac41c @cavalier38 cavalier38 committed Sep 1, 2012
Showing with 11 additions and 5 deletions.
  1. +2 −2 libs/depends.lunar
  2. +4 −1 libs/main.lunar
  3. +5 −2 prog/lin
View
@@ -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
View
@@ -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
View
@@ -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 ;;

0 comments on commit f3eaae0

Please sign in to comment.