Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=89aa9757e40254a43b2439f5eb28c337f1fb3017
commit 89aa9757e40254a43b2439f5eb28c337f1fb3017 Author: Michel Hermier <[email protected]> Date: Sat Nov 24 05:51:41 2012 +0100 scripts/makepkg * Move source preparations to a function. diff --git a/scripts/makepkg b/scripts/makepkg index 1f7c3a3..e5d7418 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1561,6 +1561,25 @@ makepkg_parseargs() { fi } +makepkg_prepare_sources() { + sources_download + + if [ "$NOVALIDATE" -eq 1 ]; then + warning "Skipping source integrity checks -- using existing src/ tree" + else + sources_sha1sum_validate + sources_gpg_validate + fi + + sources_sha1sum_generate + sources_extract + + if [ "`id -u`" = "0" ]; then + # chown all source files to root.root + chown -R root.root $startdir/src + fi +fi + makepkg_build() { if [ "$NOBUILD" -eq 1 ]; then return 0 @@ -1992,23 +2011,7 @@ if grep -i -q "^# Compiling Time: [~0-9\.]\+ SBU$" $BUILDSCRIPT && \ fi fi -sources_download - -if [ "$NOVALIDATE" -eq 1 ]; then - warning "Skipping source integrity checks -- using existing src/ tree" -else - sources_sha1sum_validate - sources_gpg_validate -fi - -sources_sha1sum_generate -sources_extract - -if [ "`id -u`" = "0" ]; then - # chown all source files to root.root - chown -R root.root $startdir/src -fi - +makepkg_prepare_sources if [ "$NOBUILD" = "1" ]; then msg "Sources are ready." exit 0 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
