diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
| commit | b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch) | |
| tree | 5948e97345062a759a5ab8d355b0b49849abcfcf /system/apk-tools | |
| parent | d61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff) | |
| parent | 6bd200ed124893c95fda0335b684b26eba0bb743 (diff) | |
| download | packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2 packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip | |
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git
See merge request adelie/packages!293
Diffstat (limited to 'system/apk-tools')
| -rw-r--r-- | system/apk-tools/APKBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index 86a15d28a..5305ed1cb 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -56,16 +56,16 @@ static() { # lets sign the static binary so it can be vefified from distros # that does not have apk-tools - local abuild_conf=${ABUILD_CONF:-"/etc/abuild.conf"} - local abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"} - local abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"} + local abuild_conf="${ABUILD_CONF:-"/etc/abuild.conf"}" + local abuild_home="${ABUILD_USERDIR:-"$HOME/.abuild"}" + local abuild_userconf="${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}" [ -f "$abuild_userconf" ] && . "$abuild_userconf" local privkey="$PACKAGER_PRIVKEY" - local pubkey=${PACKAGER_PUBKEY:-"${privkey}.pub"} - local keyname=${pubkey##*/} + local pubkey="${PACKAGER_PUBKEY:-"${privkey}.pub"}" + local keyname="${pubkey##*/}" ${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static openssl dgst -sha1 -sign "$privkey" \ - -out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \ + -out "$subpkgdir/sbin/apk.static.SIGN.RSA.$keyname" \ "$subpkgdir"/sbin/apk.static } |