add grep to find crt and key files
This commit is contained in:
1 parent
56b018b4c5
commit
a3989aafaa
1 file changed
+2
-2
@@ -44,7 +44,7 @@ certs_set() {
|
|||||||
trap 'popd &> /dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR > /dev/null' RETURN
|
trap 'popd &> /dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR > /dev/null' RETURN
|
||||||
tar xvf - <&0
|
tar xvf - <&0
|
||||||
|
|
||||||
local CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name ".crt$")
|
local CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f | grep ".crt$")
|
||||||
local CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
|
local CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
|
||||||
if [[ $CRT_FILE_COUNT -lt 1 ]]; then
|
if [[ $CRT_FILE_COUNT -lt 1 ]]; then
|
||||||
dokku_log_fail "Tar archive is missing .crt file"
|
dokku_log_fail "Tar archive is missing .crt file"
|
||||||
@@ -54,7 +54,7 @@ certs_set() {
|
|||||||
local CRT_FILE=$CRT_FILE_SEARCH
|
local CRT_FILE=$CRT_FILE_SEARCH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local KEY_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name ".key$")
|
local KEY_FILE_SEARCH=$(find . -not -path '*/\.*' -type f | grep ".key$")
|
||||||
local KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
|
local KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
|
||||||
if [[ $KEY_FILE_COUNT -lt 1 ]]; then
|
if [[ $KEY_FILE_COUNT -lt 1 ]]; then
|
||||||
dokku_log_fail "Tar archive is missing .key file"
|
dokku_log_fail "Tar archive is missing .key file"
|
||||||
|
|||||||
Reference in new issue
Block a user