github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: remove deprecated egrep calls from codebase

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-17 05:59:52 -05:00
parent b04080bcb1
commit e19b52442b
18 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/shellcheck-exclude
View File

@@ -20,7 +20,6 @@
# SC2174 - When used with -p, -m only applies to the deepest directory - https://github.com/koalaman/shellcheck/wiki/SC2174
# SC2179 - Use array+=("item") to append items to an array - https://github.com/koalaman/shellcheck/wiki/SC2179
# SC2191 - The = here is literal. To assign by index, use ( [index]=value ) with no spaces. To keep as literal, quote it - https://github.com/koalaman/shellcheck/wiki/SC2191
# SC2196 - egrep is non-standard and deprecated. Use grep -E instead - https://github.com/koalaman/shellcheck/wiki/SC2196
# SC2199 - Arrays implicitly concatenate in [[ ]]. Use a loop (or explicit * instead of @) - https://github.com/koalaman/shellcheck/wiki/SC2199
# SC2207 - Prefer mapfile or read -a to split command output (or quote to avoid splitting) - https://github.com/koalaman/shellcheck/wiki/SC2207
# SC2219 - Instead of 'let expr', prefer (( expr )) - https://github.com/koalaman/shellcheck/wiki/SC2219

6
tests/unit/10_ps-dockerfile.bats
View File

@@ -98,7 +98,7 @@ teardown() {
CIDS+=" "
done
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
run /bin/bash -c "docker ps -q --no-trunc | grep -E \"$CIDS_PATTERN\" | wc -l | grep 2"
echo "output: $output"
echo "status: $status"
assert_success
@@ -113,7 +113,7 @@ teardown() {
CIDS+=" "
done
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
run /bin/bash -c "docker ps -q --no-trunc | grep -E \"$CIDS_PATTERN\" | wc -l | grep 1"
echo "output: $output"
echo "status: $status"
assert_success
@@ -147,7 +147,7 @@ teardown() {
CIDS+=" "
done
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
run /bin/bash -c "docker ps -q --no-trunc | grep -E \"$CIDS_PATTERN\" | wc -l | grep 1"
echo "output: $output"
echo "status: $status"
assert_success

4
tests/unit/10_ps-herokuish.bats
View File

@@ -86,7 +86,7 @@ teardown() {
CIDS+=" "
done
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
run /bin/bash -c "docker ps -q --no-trunc | grep -E \"$CIDS_PATTERN\" | wc -l | grep 2"
echo "output: $output"
echo "status: $status"
assert_success
@@ -103,7 +103,7 @@ teardown() {
CIDS+=" "
done
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
run /bin/bash -c "docker ps -q --no-trunc | grep -E \"$CIDS_PATTERN\" | wc -l | grep 1"
echo "output: $output"
echo "status: $status"
assert_success

4
tests/unit/20_config.bats
View File

@@ -155,7 +155,7 @@ teardown() {
@test "(config) global config (herokuish)" {
deploy_app
run /bin/bash -c "dokku run $TEST_APP env | egrep '^global_test=true'"
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
echo "output: $output"
echo "status: $status"
assert_success
@@ -163,7 +163,7 @@ teardown() {
@test "(config) global config (dockerfile)" {
deploy_app dockerfile
run /bin/bash -c "dokku run $TEST_APP env | egrep '^global_test=true'"
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
echo "output: $output"
echo "status: $status"
assert_success

4
tests/unit/40_core_2.bats
View File

@@ -30,11 +30,11 @@ teardown() {
@test "(core) run (with --env / -e)" {
deploy_app
run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | egrep '^TEST=testvalue'"
run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | grep -E '^TEST=testvalue'"
echo "output: $output"
echo "status: $status"
run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | egrep '^TEST2=testvalue2'"
run /bin/bash -c "dokku run --env TEST=testvalue -e TEST2=testvalue2 $TEST_APP env | grep -E '^TEST2=testvalue2'"
echo "output: $output"
echo "status: $status"
assert_success

2
tests/unit/40_nginx-vhosts_2.bats
View File

@@ -18,7 +18,7 @@ teardown() {
@test "(nginx-vhosts) nginx (no server tokens)" {
deploy_app
run /bin/bash -c "curl -s -D - $(dokku url $TEST_APP) -o /dev/null | egrep '^Server' | egrep '[0-9]+'"
run /bin/bash -c "curl -s -D - $(dokku url $TEST_APP) -o /dev/null | grep -E '^Server' | grep -E '[0-9]+'"
echo "output: $output"
echo "status: $status"
assert_failure

8
tests/unit/40_tags.bats
View File

@@ -24,7 +24,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags $TEST_APP | egrep -q 'v0.9.0'"
run /bin/bash -c "dokku tags $TEST_APP | grep -q -E 'v0.9.0'"
echo "output: $output"
echo "status: $status"
assert_success
@@ -33,7 +33,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags $TEST_APP | egrep -q 'v0.9.0'"
run /bin/bash -c "dokku tags $TEST_APP | grep -q -E 'v0.9.0'"
echo "output: $output"
echo "status: $status"
assert_failure
@@ -48,11 +48,11 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker ps | egrep '/start web'| egrep -q dokku/${TEST_APP}:v0.9.0"
run /bin/bash -c "docker ps | grep -E '/start web'| grep -q -E dokku/${TEST_APP}:v0.9.0"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker images | egrep "dokku/${TEST_APP}"| egrep -q latest"
run /bin/bash -c "docker images | grep -E "dokku/${TEST_APP}"| grep -q -E latest"
echo "output: $output"
echo "status: $status"
assert_success

2
tests/unit/test_helper.bash
View File

@@ -177,7 +177,7 @@ add_domain() {
# shellcheck disable=SC2119
check_urls() {
local PATTERN="$1"
run /bin/bash -c "dokku --quiet urls $TEST_APP | egrep \"${1}\""
run /bin/bash -c "dokku --quiet urls $TEST_APP | grep -E \"${1}\""
echo "output: $output"
echo "status: $status"
assert_success