diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/makepkg-template.pl.in | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 11 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index d9da1674..4bfd4d6a 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -109,7 +109,7 @@ sub load_template { my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); if (!$version) { - die sprintf(gettext("Couldn't detect version for template '%s'"), $values->{name}); + die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name}); } my $parsed = process_file($path); @@ -128,7 +128,7 @@ sub process_file { my $nesting_level = 0; my $linenumber = 0; - open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s"), $filename, $!); + open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s\n"), $filename, $!); my @lines = <$fh>; close $fh; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da68dc74..00beb76e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1284,22 +1284,23 @@ verify_integrity_one() { } verify_integrity_sums() { - local integ=$1 arch=$2 integrity_sums=() sources=() + local integ=$1 arch=$2 integrity_sums=() sources=() srcname if [[ $arch ]]; then array_build integrity_sums "${integ}sums_$arch" - array_build sources "source_$arch" + srcname=source_$arch else array_build integrity_sums "${integ}sums" - array_build sources source + srcname=source fi + array_build sources "$srcname" if (( ${#integrity_sums[@]} == 0 && ${#sources[@]} == 0 )); then return 1 fi if (( ${#integrity_sums[@]} == ${#sources[@]} )); then - msg "$(gettext "Validating source files with %s...")" "${integ}sums" + msg "$(gettext "Validating %s files with %s...")" "$srcname" "${integ}sums" local idx errors=0 for (( idx = 0; idx < ${#sources[*]}; idx++ )); do verify_integrity_one "${sources[idx]}" "$integ" "${integrity_sums[idx]}" || errors=1 @@ -1352,7 +1353,7 @@ check_checksums() { done if (( ${#correlation[*]} )); then - error "$(gettext "Integrity checks are missing.")" + error "$(gettext "Integrity checks are missing for: %s")" "${!correlation[*]}" exit 1 # TODO: error code fi } diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index be49326e..fe63974d 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -140,7 +140,7 @@ create_xdelta() deltafile=$(dirname "$newfile")/$pkgname-${oldver}_to_${newver}-$arch.delta local ret=0 - xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? + xdelta3 -q -f -9 -S lzma -s "$oldfile" "$newfile" "$deltafile" || ret=$? if (( ret )); then error "$(gettext "Delta could not be created.")" return 1 |