testing/etcd: fix and improve sed regex in init

This commit is contained in:
Francesco Colista 2020-08-12 11:49:09 +00:00
parent 912cbdbaf5
commit a3d03e5116
2 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=etcd
pkgver=3.4.10
pkgrel=2
pkgrel=3
pkgdesc="A highly-available key value store for shared configuration and service discovery"
options="chmod-clean"
url="https://github.com/coreos/etcd"
@ -58,4 +58,4 @@ ctl() {
sha512sums="104bfce77778df4704caafc45b731bb440060be1d802a42642f33cc6c2ad11b7f94c237c1b8a47c38d1e109b71b31cc6cd8a666796fe2dbc925722fee1c2c4da etcd-3.4.10.tar.gz
86f726d77a3fbe87908c5a5b6e3c5b81f0b428de05a211fd1ea82058285c1a64898ca8a79ef8458db5ed5fd53d72e3a457eb55c0c297981363edf60d2d28b4af etcd.yaml-3.4.10
8b917d2b3a136a97dd9565a91377420ce1f812bfb10bb0caa95f1024dd366cb78ebb0539f16ddfbc399325d41a6664b856d49c5c9aa67bc27e36040f2227356e etcd.confd
21b00ca071417287ea6d4a14591145edae375c12f22dbab61749883bb304023a7e580dd6925ecebe115c91d257eddd29d294ed6ab9bff79cde94c30cb3dcd78e etcd.initd"
b67f7fd209a29ed2a6ef86d5a3c07cf5dc4138af7c61c3a928471cd79f5579ce7861fd21167db332727dfb2a8e554722366c6505e447f3b2feeae819f869aa11 etcd.initd"

View File

@ -7,7 +7,7 @@ supervisor=supervise-daemon
name="$RC_SVCNAME"
description="Highly-available key-value store"
ETCD_DATA_DIR=$(sed -n 's/^data-dir:./\1/p' $ETCD_CONFIG_FILE)
ETCD_DATA_DIR=$(sed -nr 's/^data-dir:\s*(\/.*)/\1/p' $ETCD_CONFIG_FILE)
command=/usr/bin/etcd
command_args="--config-file=${ETCD_CONFIG_FILE}"