diff --git a/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/guest-agent.conf b/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/guest-agent.conf index 4420e105ed..51bd0ab41c 100644 --- a/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/guest-agent.conf +++ b/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/guest-agent.conf @@ -9,7 +9,7 @@ respawn limit 2 2 exec guest-agent --config-file /etc/trove/guest-agent.conf 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 end script diff --git a/integration/scripts/functions b/integration/scripts/functions index 2f50bdc5d1..573c71d754 100644 --- a/integration/scripts/functions +++ b/integration/scripts/functions @@ -17,7 +17,7 @@ function git_clone { GIT_DEST=$2 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 [[ ! -d $GIT_DEST ]]; then git_timed clone $GIT_REMOTE $GIT_DEST diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 9729689df2..885b7b1326 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -553,7 +553,7 @@ function cmd_start_deps() { sudo losetup -f --show ${VOLUME_BACKING_FILE} 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" sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 ${SWIFT_DISK_IMAGE} ${SWIFT_DATA_DIR}/drives/sdb1 || true fi