diff options
Diffstat (limited to 'trunk/src/mkbuild')
| -rwxr-xr-x | trunk/src/mkbuild | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index d356d23..1eec883 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -688,8 +688,8 @@ function load_parameters { MKBUILDS_DIR="`eval_parameter MKBUILDS_DIR /var/simplaret/mkbuilds`" [ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR - SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_DIR svn://slack.sarava.org/slackbuilds`" - MKBUILDS_SVN="`eval_parameter MKBUILDS_SVN svn://slack.sarava.org/mkbuilds`" + SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_DIR http://slack.sarava.org/slackbuilds`" + MKBUILDS_SVN="`eval_parameter MKBUILDS_SVN http://slack.sarava.org/mkbuilds`" COLOR_MODE="`eval_parameter COLOR_MODE none`" @@ -788,13 +788,17 @@ if [ ! -z $MKBUILD_NAME ]; then AUX=`get_mkbuild_status "svn_source"` SVN_MOD=`convert_boolean "$AUX"` + + AUX=`get_mkbuild_status "git_source"` + GIT_MOD=`convert_boolean "$AUX"` + # Check sections - if [ $SVN_MOD -eq $on -o $URL == "" ]; then + if [ $SVN_MOD -eq $on -o $GIT_MOD -eq $on -o $URL == "" ]; then LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source" [ $VERBOSE -eq $on ] && echo -e "\nCheck subversion or empty URL" for i in $LIST_OFF; do if [ `get_mkbuild_status "$i"` != "off" ]; then - handle_error $ERROR_MKBUILD_SVN + handle_error $ERROR_MKBUILD_VCS else [ $VERBOSE -eq $on ] && echo -e "off: $i is ok." fi @@ -810,7 +814,7 @@ if [ ! -z $MKBUILD_NAME ]; then fi [ $VERBOSE -eq $on ] && echo "[[DOWNLOAD FOLDER URL]]=\"$URL_BASE\"" - if [ $SVN_MOD -eq $off ]; then + if [ $SVN_MOD -eq $off && $GIT_MOD -eq $off ]; then # Extension EXTENSION=`validate_parameter "$EXTENSION" "EXTENSION" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "EXTENSION" [ $VERBOSE -eq $on ] && echo "[[EXTENSION]]=\"$EXTENSION\"" |