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 /user/openjdk8/APKBUILD | |
| 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 'user/openjdk8/APKBUILD')
| -rw-r--r-- | user/openjdk8/APKBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 24dd5e28a..8ac3960b4 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -104,8 +104,8 @@ unpack() { prepare() { cd "$builddir" - local ver_u=$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4) - local ver_b=$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4) + local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" |