Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit 95f1646

Browse files
committed
Merge branch '0.16.0'
2 parents 6437485 + 3993846 commit 95f1646

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

commands/database

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ function database_import() {
156156

157157
fi
158158

159-
database_backup "${basefile}.bak"
160-
161-
if [ $? -ne 0 ]; then
162-
output "Error when backing up to ${basefile}.bak"
163-
return 4
159+
if [ ! $(has_arg --no-backup) ]; then
160+
database_backup "${basefile}.bak"
161+
if [ $? -ne 0 ]; then
162+
output "Error when backing up to ${basefile}.bak"
163+
return 4
164+
fi
164165
fi
165166

166167
output "Dropping any prior tables"
@@ -295,6 +296,7 @@ function database_chunk() {
295296
--line-bytes="${CHUNK_SIZE}" \
296297
--numeric-suffixes="1" \
297298
--additional-suffix=".sql.chunk" \
299+
--suffix-length=3 \
298300
"${backup_file}" \
299301
"${sql_filename}/${sql_basename}-"
300302
if [ $? -ne 0 ]; then

commands/help

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ${YELLOW}WPLib Box ${GREEN}CLI${RESET} usage:
77
box ${GREEN}database${RESET} [<args>] - Manage databases.
88
box ${GREEN}container${RESET} [<args>] - Manage Docker containers.
99
10-
box ${GREEN}start${RESET} - Start Docker containers found in project.json's services object.
10+
box ${GREEN}startup${RESET} - Start Docker containers found in project.json's services object.
1111
box ${GREEN}restart${RESET} - Restart Docker containers found in project.json's services object.
1212
box ${GREEN}shutdown${RESET} - Shutdown all Docker containers.
1313

0 commit comments

Comments
 (0)