openstack/trove
Code Issues Proposed changes

Replaced usage outdate egrep to grep

Browse Source 
Change-Id: I78f4c93d4d196e5d870a39256cb90dcbec41da45
Signed-off-by: Ivan Anfimov <lazekteam@gmail.com>
This commit is contained in:
Ivan Anfimov
2025-07-16 21:59:34 +00:00
parent 8420adb0a7
commit 5937eb6cb5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/guest-agent.conf
View File

@@ -9,7 +9,7 @@ respawn limit 2 2
exec guest-agent --config-file /etc/trove/guest-agent.conf exec guest-agent --config-file /etc/trove/guest-agent.conf
post-start script post-start script
PID=`status guest-agent | egrep -oi '([0-9]+)$' | head -n1` PID=`status guest-agent | grep -Eoi '([0-9]+)$' | head -n1`
echo $PID > /var/run/guest-agent.pid echo $PID > /var/run/guest-agent.pid
end script end script

2
integration/scripts/functions
View File

@@ -17,7 +17,7 @@ function git_clone {
GIT_DEST=$2 GIT_DEST=$2
GIT_BRANCH=$3 GIT_BRANCH=$3
if echo $GIT_BRANCH | egrep -q "^refs"; then if echo $GIT_BRANCH | grep -E "^refs"; then
# If our branch name is a gerrit style refs/changes/... # If our branch name is a gerrit style refs/changes/...
if [[ ! -d $GIT_DEST ]]; then if [[ ! -d $GIT_DEST ]]; then
git_timed clone $GIT_REMOTE $GIT_DEST git_timed clone $GIT_REMOTE $GIT_DEST

2
integration/scripts/trovestack
View File

@@ -553,7 +553,7 @@ function cmd_start_deps() {
sudo losetup -f --show ${VOLUME_BACKING_FILE} sudo losetup -f --show ${VOLUME_BACKING_FILE}
fi fi
if ! egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then if ! grep -E ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
exclaim "Re-mounting Swift Disk Image" exclaim "Re-mounting Swift Disk Image"
sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 ${SWIFT_DISK_IMAGE} ${SWIFT_DATA_DIR}/drives/sdb1 || true sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 ${SWIFT_DISK_IMAGE} ${SWIFT_DATA_DIR}/drives/sdb1 || true
fi fi