diff options
| -rw-r--r-- | doc/PKGBUILD.5.txt | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 54 |
2 files changed, 31 insertions, 27 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 41c468ee..ef6bace0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -161,7 +161,7 @@ name. The syntax is: `source=('filename::url')`. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' dependency of other packages. Provisions involving the '>' and '<' - operators are invalid as only specifc versions of a package may be + operators are invalid as only specific versions of a package may be provided. *replaces (array)*:: @@ -221,7 +221,7 @@ name. The syntax is: `source=('filename::url')`. operation, even if the version number would normally not trigger such an upgrade. This is useful when the version numbering scheme of a package changes (or is alphanumeric). See linkman:pacman[8] for - more infomation on version comparisons. + more information on version comparisons. build() Function diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 433fe348..2140ff09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,22 +871,7 @@ tidy_install() { fi } -create_package() { - if [ -z "$1" ]; then - nameofpkg="$pkgname" - else - nameofpkg="$1" - fi - - if [ ! -d "$pkgdir" ]; then - error "$(gettext "Missing pkg/ directory.")" - plain "$(gettext "Aborting...")" - exit 1 # $E_MISSING_PKGDIR - fi - - cd "$pkgdir" - msg "$(gettext "Creating package...")" - +write_pkginfo() { local builddate=$(date -u "+%s") if [ -n "$PACKAGER" ]; then local packager="$PACKAGER" @@ -958,6 +943,25 @@ create_package() { warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi +} + +create_package() { + if [ ! -d "$pkgdir" ]; then + error "$(gettext "Missing pkg/ directory.")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_PKGDIR + fi + + if [ -z "$1" ]; then + nameofpkg="$pkgname" + else + nameofpkg="$1" + fi + + write_pkginfo $nameofpkg + + cd "$pkgdir" + msg "$(gettext "Creating package...")" local comp_files=".PKGINFO" @@ -1012,15 +1016,15 @@ create_package() { create_srcpackage() { cd "$startdir" - if [ "$SOURCEONLY" -eq 2 ]; then - # get back to our src directory so we can begin with sources - mkdir -p "$srcdir" - cd "$srcdir" - download_sources - # we can only check checksums if we have all files - check_checksums - cd "$startdir" - fi + + # Get back to our src directory so we can begin with sources. + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + # We can only check checksums if we have all files. + check_checksums + cd "$startdir" + msg "$(gettext "Creating source package...")" local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} |