mirror of
https://github.com/nextcloud/docker.git
synced 2024-09-29 16:02:36 +02:00
Merge 622cdd6259
into f6d767efb1
This commit is contained in:
commit
4b88a71e90
1 changed files with 2 additions and 2 deletions
|
@ -60,8 +60,8 @@ file_env() {
|
|||
local var="$1"
|
||||
local fileVar="${var}_FILE"
|
||||
local def="${2:-}"
|
||||
local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
|
||||
local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
|
||||
local varValue="`env | grep -E \"^${var}=\" | sed -E -e \"s/^${var}=//\"`"
|
||||
local fileVarValue="`env | grep -E \"^${fileVar}=\" | sed -E -e \"s/^${fileVar}=//\"`"
|
||||
if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
|
||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||
exit 1
|
||||
|
|
Loading…
Reference in a new issue