From 263b7549c3a6cdf2e36a0940fc001c30f56816a4 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Fri, 30 Aug 2019 16:20:25 +0200
Subject: [PATCH] [build] rename duniter-rs -> dunitrust
---
README.md | 2 +-
images/{duniter-rs.png => dunitrust.png} | Bin
release/arch/armv7/build-armv7.sh | 12 ++++++------
release/arch/linux-x64/build-lin-x64.sh | 12 ++++++------
release/arch/win64/build-win64.sh | 8 ++++----
release/docker/Dockerfile | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
rename images/{duniter-rs.png => dunitrust.png} (100%)
diff --git a/README.md b/README.md
index e2f4ca81..0c5b546f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+
# Duniter Rust (Dunitrust)
diff --git a/images/duniter-rs.png b/images/dunitrust.png
similarity index 100%
rename from images/duniter-rs.png
rename to images/dunitrust.png
diff --git a/release/arch/armv7/build-armv7.sh b/release/arch/armv7/build-armv7.sh
index 2b4f3c5f..6a7552f2 100644
--- a/release/arch/armv7/build-armv7.sh
+++ b/release/arch/armv7/build-armv7.sh
@@ -61,8 +61,8 @@ build_extra_server() {
build_deb_pack() {
#cd "bin/dunitrust-${1}"
#cargo build --release --target=armv7-unknown-linux-gnueabihf --features=ssl
- cargo deb --manifest-path="bin/dunitrust-${1}/Cargo.toml" --target=${TARGET} --variant=arm --output "${BIN}/duniter-rust-${1}-${DURS_TAG}-armv7.deb"
- create_desc "${BIN}/duniter-rust-${1}-${DURS_TAG}-armv7.deb" "${1}" "Linux (Ubuntu/Debian/Raspbian)"
+ cargo deb --manifest-path="bin/dunitrust-${1}/Cargo.toml" --target=${TARGET} --variant=arm --output "${BIN}/dunitrust-${1}-${DURS_TAG}-armv7.deb"
+ create_desc "${BIN}/dunitrust-${1}-${DURS_TAG}-armv7.deb" "${1}" "Linux (Ubuntu/Debian/Raspbian)"
}
# ------------
@@ -96,11 +96,11 @@ cp "${ROOT}/target/${TARGET}/release/dunitrust" "${RELEASES}/server_/" || exit 1
#cp "${ROOT}/target/release/dunitrust" "${RELEASES}/desktop_" || exit 1
# Copy logo
-cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/server_/" || exit 1
-#cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/desktop_" || exit 1
+cp "${ROOT}/images/dunitrust.png" "${RELEASES}/server_/" || exit 1
+#cp "${ROOT}/images/dunitrust.png" "${RELEASES}/desktop_" || exit 1
# package tar.gz for server variant
cd "${RELEASES}/server_"
-tar czf "${BIN}/duniter-rust-server-${DURS_TAG}-armv7.tar.gz" * || exit 1
-create_desc "${BIN}/duniter-rust-server-${DURS_TAG}-armv7.tar.gz" "Server" "Linux (generic)"
+tar czf "${BIN}/dunitrust-server-${DURS_TAG}-armv7.tar.gz" * || exit 1
+create_desc "${BIN}/dunitrust-server-${DURS_TAG}-armv7.tar.gz" "Server" "Linux (generic)"
diff --git a/release/arch/linux-x64/build-lin-x64.sh b/release/arch/linux-x64/build-lin-x64.sh
index c6ecceac..a1d32649 100644
--- a/release/arch/linux-x64/build-lin-x64.sh
+++ b/release/arch/linux-x64/build-lin-x64.sh
@@ -58,8 +58,8 @@ build_extra_server() {
# Parameters:
# 1. Building type (either “desktop” or “server”).
build_deb_pack() {
- cargo deb --manifest-path "${ROOT}/bin/dunitrust-${1}/Cargo.toml" --output "${BIN}/dunitrust-server-${1}-${DURS_TAG}-linux-x64.deb"
- create_desc "${BIN}/duniter-rust-${1}-${DURS_TAG}-linux-x64.deb" "${1}" "Linux (Ubuntu/Debian)"
+ cargo deb --manifest-path "${ROOT}/bin/dunitrust-${1}/Cargo.toml" --output "${BIN}/dunitrust-${1}-${DURS_TAG}-linux-x64.deb"
+ create_desc "${BIN}/dunitrust-${1}-${DURS_TAG}-linux-x64.deb" "${1}" "Linux (Ubuntu/Debian)"
}
# ------------
@@ -93,10 +93,10 @@ cp "${ROOT}/target/release/dunitrust" "${RELEASES}/server_/" || exit 1
#cp "${ROOT}/target/release/dunitrust" "${RELEASES}/desktop_" || exit 1
# Copy logo
-cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/server_/" || exit 1
-#cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/desktop_" || exit 1
+cp "${ROOT}/images/dunitrust.png" "${RELEASES}/server_/" || exit 1
+#cp "${ROOT}/images/dunitrust.png" "${RELEASES}/desktop_" || exit 1
# package tar.gz for server variant
cd "${RELEASES}/server_"
-tar czf "${BIN}/duniter-rust-server-${DURS_TAG}-linux-x64.tar.gz" * || exit 1
-create_desc "${BIN}/duniter-rust-server-${DURS_TAG}-linux-x64.tar.gz" "Server" "Linux (generic)"
+tar czf "${BIN}/dunitrust-server-${DURS_TAG}-linux-x64.tar.gz" * || exit 1
+create_desc "${BIN}/dunitrust-server-${DURS_TAG}-linux-x64.tar.gz" "Server" "Linux (generic)"
diff --git a/release/arch/win64/build-win64.sh b/release/arch/win64/build-win64.sh
index 770e8dae..ddce88ba 100644
--- a/release/arch/win64/build-win64.sh
+++ b/release/arch/win64/build-win64.sh
@@ -77,8 +77,8 @@ cp "${ROOT}/target/${TARGET}/release/dunitrust.exe" "${RELEASES}/server_/" || ex
#cp "${ROOT}/target/${TARGET}/release/dunitrust" "${RELEASES}/desktop_" || exit 1
# Copy logo
-#cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/server_/" || exit 1
-#cp "${ROOT}/images/duniter-rs.png" "${RELEASES}/desktop_" || exit 1
+#cp "${ROOT}/images/dunitrust.png" "${RELEASES}/server_/" || exit 1
+#cp "${ROOT}/images/dunitrust.png" "${RELEASES}/desktop_" || exit 1
# ---------------
@@ -86,5 +86,5 @@ cp "${ROOT}/target/${TARGET}/release/dunitrust.exe" "${RELEASES}/server_/" || ex
# ---------------
cd "${RELEASES}/server_"
-zip "${BIN}/duniter-rust-server-${DURS_TAG}-windows-x64.zip" * || exit 1
-create_desc "${BIN}/duniter-rust-server-${DURS_TAG}-windows-x64.zip" "Server" "Windows"
+zip "${BIN}/dunitrust-server-${DURS_TAG}-windows-x64.zip" * || exit 1
+create_desc "${BIN}/dunitrust-server-${DURS_TAG}-windows-x64.zip" "Server" "Windows"
diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile
index 889d401a..dddf60d4 100644
--- a/release/docker/Dockerfile
+++ b/release/docker/Dockerfile
@@ -4,7 +4,7 @@
FROM registry.duniter.org/docker/dunitrust/dunitrust-ci-lin64:latest as build
-LABEL maintainer="elois <elois@duniter.org>>"
+LABEL maintainer="elois <elois@dunitrust.org>"
LABEL version="0.1.3"
LABEL description="Dunitrust server (Divende Universel Rust)"
--
GitLab