Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lget issue #19 #31

Merged
merged 2 commits into from
Jan 16, 2013
Merged

Lget issue #19 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3eaae0
Added --download to lin
cavalier38 Sep 1, 2012
9f4cb43
Updated man lin with --download
cavalier38 Sep 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/depends.lunar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion libs/main.lunar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions man/lin.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions prog/lin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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 ;;
Expand Down