Skip to content

Commit 2e01067

Browse files
committed
fixed OPT_DEFAULT_COMMENT_STATUS value and cleaned-up output
1 parent bcebbe9 commit 2e01067

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

setup-wordpress.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trap '_es=${?};
2626
source .env
2727
OPT_DATE_FORMAT=Y-m-d
2828
OPT_TIME_FORMAT='H:i'
29-
OPT_DEFAULT_COMMENT_STATUS=''
29+
OPT_DEFAULT_COMMENT_STATUS=closed
3030
PLUGINS_ACTIVATE='
3131
acf-menu-chooser
3232
advanced-custom-fields
@@ -188,32 +188,30 @@ update_wordpress_options() {
188188
_date_format=$(wpcli option get date_format)
189189
if [[ "${OPT_DATE_FORMAT}" != "${_date_format}" ]]
190190
then
191-
echo "Update date_format: '${OPT_DATE_FORMAT}'"
191+
echo "Update date_format: ${OPT_DATE_FORMAT}"
192192
wpcli option update date_format "${OPT_DATE_FORMAT}"
193193
else
194-
no_op "date_format is already: '${OPT_DATE_FORMAT}'"
194+
no_op "date_format: ${OPT_DATE_FORMAT}"
195195
fi
196196

197197
_default_comment_status=$(wpcli option get default_comment_status)
198198
if [[ "${OPT_DEFAULT_COMMENT_STATUS}" != "${_default_comment_status}" ]]
199199
then
200-
echo -n "Update default_comment_status: ${OPT_DEFAULT_COMMENT_STATUS}"
201-
echo ' (disabled)'
200+
echo "Update default_comment_status: ${OPT_DEFAULT_COMMENT_STATUS}"
202201
wpcli option update default_comment_status \
203202
"${OPT_DEFAULT_COMMENT_STATUS}"
204203
else
205-
_noop='default_comment_status is already:'
206-
_noop="${_noop} '${OPT_DEFAULT_COMMENT_STATUS}' (disabled)"
204+
_noop="default_comment_status: ${OPT_DEFAULT_COMMENT_STATUS}"
207205
no_op "${_noop}"
208206
fi
209207

210208
_time_format=$(wpcli option get time_format)
211209
if [[ "${OPT_TIME_FORMAT}" != "${_time_format}" ]]
212210
then
213-
echo "Update time_format: '${OPT_TIME_FORMAT}'"
211+
echo "Update time_format: ${OPT_TIME_FORMAT}"
214212
wpcli option update time_format "${OPT_TIME_FORMAT}"
215213
else
216-
no_op "time_format is already: '${OPT_TIME_FORMAT}'"
214+
no_op "time_format: ${OPT_TIME_FORMAT}"
217215
fi
218216

219217
echo

0 commit comments

Comments
 (0)