Leave extra directory in generic delivery

Closes #1410

release/Makefile

@@ -119,6 +119,7 @@ ifneq ($(ADD_DEBUG),Y)
 	@find -name "*.d.ts" -delete -o -name "*.js.map" -delete
 endif
 	@rm -rf $(DEV_FILES)
+	@mv release/extra .
 	@rm -rf coverage coverage.* release test
 	@rm -rf target
 	@rm -rf neon/native/target

release/arch/arm/build-arm.sh

@@ -72,14 +72,15 @@ cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node
 cd ..
 
 # Creating DEB packaging
-cp -r "$DOWNLOADS"/duniter/release/extra/debian/package duniter-${ARCH}
+mv duniter/extra/debian/package duniter-${ARCH}
 mkdir -p duniter-${ARCH}/opt/duniter/
 mkdir -p duniter-${ARCH}/etc/bash_completion.d/
 chmod 755 duniter-${ARCH}/DEBIAN/post*
 chmod 755 duniter-${ARCH}/DEBIAN/pre*
 sed -i "s/Version:.*/Version:$DUNITER_DEB_VER/g" duniter-${ARCH}/DEBIAN/control
 echo "Extra..."
-cp "$DOWNLOADS"/duniter/release/extra/completion/duniter_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_completion.bash
+mv duniter/extra/completion/duniter_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_completion.bash
+rm -rf duniter/extra
 echo "Zipping..."
 cd duniter
 zip -qr ../duniter.zip *

release/arch/linux/build-lin.sh

@@ -34,7 +34,7 @@ create_desc() {
 # Parameters:
 # 1. Building directory.
 build_extra_desktop() {
-	cp -r "${ROOT}/release/extra/desktop/"* "${1}" || exit 1
+	mv "${RELEASES}/desktop_/extra/desktop/"* "${1}" || exit 1
 }
 
 # Server specific building phase.
@@ -43,9 +43,9 @@ build_extra_desktop() {
 # 1. Building directory.
 build_extra_server() {
 	mkdir -p "${1}/lib/systemd/system" || exit 1
-	cp "${ROOT}/release/extra/systemd/duniter.service" "${1}/lib/systemd/system" || exit 1
+	mv "${RELEASES}/server_/extra/systemd/duniter.service" "${1}/lib/systemd/system" || exit 1
 	mkdir -p "${1}/etc/bash_completion.d/" || exit 1
-	cp "${ROOT}/release/extra/completion/duniter_completion.bash" "${1}/etc/bash_completion.d/duniter_completion.bash" || exit 1
+	mv "${RELEASES}/server_/extra/completion/duniter_completion.bash" "${1}/etc/bash_completion.d/duniter_completion.bash" || exit 1
 }
 
 # Debian package building.
@@ -56,7 +56,7 @@ build_extra_server() {
 build_deb_pack() {
 	rm -rf "${RELEASES}/duniter-x64"
 	mkdir "${RELEASES}/duniter-x64" || exit 1
-	cp -r "${ROOT}/release/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1
+	mv "${RELEASES}/${1}_/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1
 	build_extra_${1} "${RELEASES}/duniter-x64"
 	mkdir -p "${RELEASES}/duniter-x64/opt/duniter/" || exit 1
 	chmod 755 "${RELEASES}/duniter-x64/DEBIAN/"post* || exit 1
@@ -64,6 +64,7 @@ build_deb_pack() {
 	sed -i "s/Version:.*/Version:${DUNITER_DEB_VER}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1
 
 	cd "${RELEASES}/${1}_/"
+	rm -rf extra
 	zip -yqr "${RELEASES}/duniter-x64/opt/duniter/duniter.zip" * || exit 1
 
 	sed -i "s/Package: .*/Package: ${2}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1

release/docker/Dockerfile

@@ -27,7 +27,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 RUN PATH=${HOME}/.cargo/bin:${PATH} \
 	RUSTFLAGS="-C target-feature=-crt-static" \
 	make -C release ADD_DEBUG=N server-gui clean \
-	&& mv release/docker/duniter.sh work/docker.sh
+	&& cp release/docker/duniter.sh work/docker.sh \
+	&& rm -rf work/extra
 
 # ------------------------------------------------------------------------------
 # Final Stage