Merge branch 'master' of git://github.com/slavapestov/factor
commit
1037a30e4d
|
@ -24,7 +24,7 @@ test_program_installed() {
|
||||||
}
|
}
|
||||||
|
|
||||||
exit_script() {
|
exit_script() {
|
||||||
if [[ $FIND_MAKE_TARGET -eq true ]] ; then
|
if [[ $FIND_MAKE_TARGET = true ]] ; then
|
||||||
# Must be echo not $ECHO
|
# Must be echo not $ECHO
|
||||||
echo $MAKE_TARGET;
|
echo $MAKE_TARGET;
|
||||||
fi
|
fi
|
||||||
|
@ -97,7 +97,7 @@ set_make() {
|
||||||
dragonflybsd) MAKE='gmake';;
|
dragonflybsd) MAKE='gmake';;
|
||||||
*) MAKE='make';;
|
*) MAKE='make';;
|
||||||
esac
|
esac
|
||||||
if ! [[ $MAKE -eq 'gmake' ]] ; then
|
if [[ $MAKE = 'gmake' ]] ; then
|
||||||
ensure_program_installed gmake
|
ensure_program_installed gmake
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -473,7 +473,7 @@ get_boot_image() {
|
||||||
}
|
}
|
||||||
|
|
||||||
get_url() {
|
get_url() {
|
||||||
if [[ $DOWNLOADER -eq "" ]] ; then
|
if [[ -z $DOWNLOADER ]] ; then
|
||||||
set_downloader;
|
set_downloader;
|
||||||
fi
|
fi
|
||||||
$ECHO $DOWNLOADER $1 ;
|
$ECHO $DOWNLOADER $1 ;
|
||||||
|
|
Loading…
Reference in New Issue