Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c8a9c039e | ||
|
|
2ee308c1d9 | ||
|
|
1fcf30e9a1 |
+4
-2
@@ -93,10 +93,12 @@ conflict_old=()
|
|||||||
conflict_new=()
|
conflict_new=()
|
||||||
while IFS='=' read -r key value; do
|
while IFS='=' read -r key value; do
|
||||||
[ -n "$value" ] || continue
|
[ -n "$value" ] || continue
|
||||||
current="$(grep -E "^${key}=" .env | head -1 | cut -d= -f2-)"
|
|
||||||
if ! grep -qE "^${key}=" .env; then
|
if ! grep -qE "^${key}=" .env; then
|
||||||
echo "${key}=${value}" >> .env
|
echo "${key}=${value}" >> .env
|
||||||
elif [ "$current" != "$value" ]; then
|
continue
|
||||||
|
fi
|
||||||
|
current="$(grep -E "^${key}=" .env | head -1 | cut -d= -f2-)"
|
||||||
|
if [ "$current" != "$value" ]; then
|
||||||
conflict_keys+=("$key")
|
conflict_keys+=("$key")
|
||||||
conflict_old+=("$current")
|
conflict_old+=("$current")
|
||||||
conflict_new+=("$value")
|
conflict_new+=("$value")
|
||||||
|
|||||||
Reference in New Issue
Block a user