From c886a0459a22f93ff199d44f382ec8a80d2e811a Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Thu, 21 Feb 2019 09:10:08 -0500 Subject: [PATCH] check for legacy directory (#1757) move data_path for docker to prevent resync symlink from /usr/bin/nano_node to /usr/bin/rai_node for legacy --- docker/node/Dockerfile | 1 + docker/node/entry.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile index 13995c11..17f4a5ef 100644 --- a/docker/node/Dockerfile +++ b/docker/node/Dockerfile @@ -24,4 +24,5 @@ COPY --from=0 /etc/nano-network /etc COPY docker/node/entry.sh /entry.sh COPY docker/node/config /usr/share/nano/config RUN chmod +x /entry.sh +RUN ln -s /usr/bin/nano_node /usr/bin/rai_node CMD ["/bin/bash", "/entry.sh"] diff --git a/docker/node/entry.sh b/docker/node/entry.sh index 25fc3fdb..c0f8b1cd 100644 --- a/docker/node/entry.sh +++ b/docker/node/entry.sh @@ -20,9 +20,17 @@ case "${network}" in ;; esac +raidir="${HOME}/RaiBlocks${dirSuffix}" nanodir="${HOME}/Nano${dirSuffix}" dbFile="${nanodir}/data.ldb" -mkdir -p "${nanodir}" + +if [ -d "${raidir}" ]; then + echo "Moving ${raidir} to ${nanodir}" + mv $raidir $nanodir +else + mkdir -p "${nanodir}" +fi + if [ ! -f "${nanodir}/config.json" ]; then echo "Config File not found, adding default." cp "/usr/share/nano/config/${network}.json" "${nanodir}/config.json"