Skip to content

Commit 619ab21

Browse files
committed
improve auto-migration console messaging
1 parent 6910490 commit 619ab21

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

root/etc/cont-init.d/v3-dir-structure-check

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
: "${AUTOMIGRATE:=false}"
44

55
if $AUTOMIGRATE; then
6+
echo "AUTOMIGATE enabled...."
67
if [[ -d "/octoprint/data" ]] || [[ -f "/octoprint/config.yaml" ]]; then
7-
echo "Migrating to octoprint-docker v3 directory structure..." && \
8+
echo "octoprint-docker v2 directory structure detected...."
9+
echo "migrating to octoprint-docker v3 directory structure..."
810
mkdir -p /octoprint/octoprint /octoprint/plugins
911
mv /octoprint/* /octoprint/octoprint
1012

@@ -14,11 +16,12 @@ if $AUTOMIGRATE; then
1416
[[ -d "/octoprint/octoprint/plugins/local" ]] && mv /octoprint/octoprint/plugins/local $PYTHONUSERBASE
1517
[[ -d "/octoprint/octoprint/plugins/share" ]] && mv /octoprint/octoprint/plugins/share $PYTHONUSERBASE
1618

17-
echo "v2 -> v3 octoprint-docker image migration complete!"
19+
echo "v2 -> v3 octoprint-docker auto-migration migration complete!"
1820
fi
1921

2022
if [[ -d "/root/.octoprint" ]]; then
21-
echo "octoprint-docker v1 directory structure detected, migrating to octoprint-docker v3 directory structure..."
23+
echo "octoprint-docker v1 directory structure detected...."
24+
echo "migrating to octoprint-docker v3 directory structure..."
2225

2326
mkdir -p /octoprint/octoprint /octoprint/plugins
2427
mv /root/.octoprint/* /octoprint/octoprint
@@ -29,7 +32,7 @@ if $AUTOMIGRATE; then
2932
[[ -d "/octoprint/octoprint/plugins/local" ]] && mv /octoprint/octoprint/plugins/local $PYTHONUSERBASE
3033
[[ -d "/octoprint/octoprint/plugins/share" ]] && mv /octoprint/octoprint/plugins/share $PYTHONUSERBASE
3134

32-
echo "v1 -> v3 octoprint-docker image migration complete!"
35+
echo "v1 -> v3 octoprint-docker auto-migration complete!"
3336
fi
3437

35-
fi
38+
fi

0 commit comments

Comments
 (0)