aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-11-17 13:49:20 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-11-17 13:49:20 +0000
commit1fe29970536f55b1c145a31a2bc9f0bff7a2b2dd (patch)
tree2891c0156f5ebdbaeffb39dc4c827525368efba8
parent61482d23acb1049f758932c4c2c3ab3f654026af (diff)
downloadsimplepkg-1fe29970536f55b1c145a31a2bc9f0bff7a2b2dd.tar.gz
simplepkg-1fe29970536f55b1c145a31a2bc9f0bff7a2b2dd.tar.bz2
mkbuild: some svn check routines extended for git
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@529 04377dda-e619-0410-9926-eae83683ac58
-rw-r--r--trunk/doc/CHANGELOG1
-rw-r--r--trunk/lib/common.sh4
-rwxr-xr-xtrunk/src/mkbuild14
3 files changed, 12 insertions, 7 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 180dbb3..1fff404 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -11,6 +11,7 @@ simplepkg changelog
- createpkg: most clean -s option output
- lspkg: fix on package search routine
- jail-commit: using unified diff
+ - mkbuild: some svn check routines extended for git
0.6pre30
========
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 06c19d7..92b00bb 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -852,8 +852,8 @@ function handle_error {
eecho $error "$BASENAME: Input parameter $2 error. See \"mkbuild --help\"." ;;
$ERROR_MKPATCH)
eecho $error "$BASENAME: Mkpatch error. Check .mkbuild file." ;;
- $ERROR_MKBUILD_SVN)
- eecho $error "$BASENAME: SVN or empty URL. Disable this sections in .mkbuild file:\n - download_source;\n - md5sum_download_and_check_0;\n - md5sum_download_and_check_1;\n - gpg_signature_check\n - untar_source"
+ $ERROR_MKBUILD_VCS)
+ eecho $error "$BASENAME: VCS or empty URL. Disable this sections in .mkbuild file:\n - download_source;\n - md5sum_download_and_check_0;\n - md5sum_download_and_check_1;\n - gpg_signature_check\n - untar_source"
;;
#
# Others errors
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\""