-
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmakepkg.patch
More file actions
54 lines (44 loc) · 1.88 KB
/
makepkg.patch
File metadata and controls
54 lines (44 loc) · 1.88 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
scripts/libmakepkg/integrity/generate_checksum.sh.in | 6 ++++--
scripts/makepkg.sh.in | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in
index dee81399..672cfae7 100644
--- a/usr/share/makepkg/integrity/generate_checksum.sh
+++ b/usr/share/makepkg/integrity/generate_checksum.sh
@@ -78,11 +78,13 @@ generate_one_checksum() {
;;
esac
+ (( numsrc > 1 )) && (( idx == 0 )) && echo
+
# indent checksum on lines after the first
- printf "%*s%s" $(( idx ? indentsz : 0 )) '' "'$sum'"
+ (( numsrc > 1 )) && echo -n "\u09"; printf "%s" "\"$sum\""
# print a newline on lines before the last
- (( idx < (numsrc - 1) )) && echo
+ (( numsrc > 1 )) && echo
done
echo ")"
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 611cc184..556f26e4 100644
--- a/usr/bin/makepkg
+++ b/usr/bin/makepkg
@@ -1282,7 +1282,7 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]];
fi
fi
-msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date +%c))"
+msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date +"%F %T %Z"))"
# if we are creating a source-only package, go no further
if (( SOURCEONLY )); then
@@ -1312,7 +1312,7 @@ if (( SOURCEONLY )); then
create_signature "$SRCPKGDEST/${pkgbase}-$(get_full_version)${SRCEXT}"
fi
- msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))"
+ msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +"%F %T %Z"))"
exit $E_OK
fi
@@ -1422,6 +1422,6 @@ if (( NOARCHIVE )); then
exit $E_OK
fi
-msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date +%c))"
+msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date +"%F %T %Z"))"
install_package && exit $E_OK || exit $E_INSTALL_FAILED