Skip to content

Commit e1a4cbb

Browse files
committed
fix: update wordpress init scripts
1 parent 1b494c4 commit e1a4cbb

2 files changed

Lines changed: 16 additions & 24 deletions

File tree

apps/wordpress/src/init.sh

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,17 @@ else
1313
fi
1414

1515
# 等待wordpress完成引导
16-
until docker exec $W9_ID wp core is-installed &>/dev/null; do
16+
until docker exec $W9_ID wp core is-installed >/dev/null 2>&1; do
1717
echo "wait for WordPress..."
1818
sleep 5
1919
done
2020

21-
# 设置home
22-
if [ "`docker exec $W9_ID wp option get home | cut -d: -f1`" == "https" ];then
23-
docker exec $W9_ID wp option update home "https://$W9_URL"
24-
else
25-
docker exec $W9_ID wp option update home "$WORDPRESS_ROOT_URL"
21+
# W9_URL为空时跳过URL更新,避免将站点URL设为无效值
22+
if [ -z "$W9_URL" ]; then
23+
echo "W9_URL is empty, skip URL update"
24+
exit 0
2625
fi
2726

28-
# 设置siteurl
29-
if [ "`docker exec $W9_ID wp option get siteurl | cut -d: -f1`" == "https" ];then
30-
docker exec $W9_ID wp option update siteurl "https://$W9_URL"
31-
else
32-
docker exec $W9_ID wp option update siteurl "$WORDPRESS_ROOT_URL"
33-
fi
27+
# 设置home和siteurl
28+
docker exec $W9_ID wp option update home "$WORDPRESS_ROOT_URL"
29+
docker exec $W9_ID wp option update siteurl "$WORDPRESS_ROOT_URL"

apps/wordpresspro/src/init.sh

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,17 @@ else
1313
fi
1414

1515
# 等待wordpress完成引导
16-
until docker exec $W9_ID-wordpress wp core is-installed &>/dev/null; do
16+
until docker exec $W9_ID-wordpress wp core is-installed >/dev/null 2>&1; do
1717
echo "wait for WordPress..."
1818
sleep 5
1919
done
2020

21-
# 设置home
22-
if [ "`docker exec $W9_ID-wordpress wp option get home | cut -d: -f1`" == "https" ];then
23-
docker exec $W9_ID-wordpress wp option update home "https://$W9_URL"
24-
else
25-
docker exec $W9_ID-wordpress wp option update home "$WORDPRESS_ROOT_URL"
21+
# W9_URL为空时跳过URL更新,避免将站点URL设为无效值
22+
if [ -z "$W9_URL" ]; then
23+
echo "W9_URL is empty, skip URL update"
24+
exit 0
2625
fi
2726

28-
# 设置siteurl
29-
if [ "`docker exec $W9_ID-wordpress wp option get siteurl | cut -d: -f1`" == "https" ];then
30-
docker exec $W9_ID-wordpress wp option update siteurl "https://$W9_URL"
31-
else
32-
docker exec $W9_ID-wordpress wp option update siteurl "$WORDPRESS_ROOT_URL"
33-
fi
27+
# 设置home和siteurl
28+
docker exec $W9_ID-wordpress wp option update home "$WORDPRESS_ROOT_URL"
29+
docker exec $W9_ID-wordpress wp option update siteurl "$WORDPRESS_ROOT_URL"

0 commit comments

Comments
 (0)