From 74bab2f817714869992c7e6ca0f21cd0ab85ec76 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Thu, 7 May 2020 11:19:24 -0600 Subject: [PATCH] Backport fix for make-release-package Signed-off-by: Morgan Tocker --- tools/make-release-packages.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/make-release-packages.sh b/tools/make-release-packages.sh index cfeed5dcd7f..ba31cb4df77 100755 --- a/tools/make-release-packages.sh +++ b/tools/make-release-packages.sh @@ -41,10 +41,9 @@ done; # Copy remaining files, preserving date/permissions # But resolving symlinks -mkdir -p "${RELEASE_DIR}"/share/vitess/ -cp -rpfL examples "${RELEASE_DIR}"/share/vitess/ +cp -rpfL examples "${RELEASE_DIR}" -echo "Follow the binary installation instructions at: https://vitess.io/docs/get-started/local/" > "${RELEASE_DIR}"/share/vitess/examples/README.md +echo "Follow the installation instructions at: https://vitess.io/docs/get-started/local/" > "${RELEASE_DIR}"/examples/README.md cd "${RELEASE_DIR}/.." tar -czf "${TAR_FILE}" "${RELEASE_ID}" @@ -52,6 +51,12 @@ tar -czf "${TAR_FILE}" "${RELEASE_ID}" cd "${RELEASE_DIR}" PREFIX=${PREFIX:-/usr} +# For RPMs and DEBs, binaries will be in /usr/bin +# Examples will be in /usr/share/vitess/examples + +mkdir -p share/vitess/ +mv examples share/vitess/ + fpm \ --force \ --input-type dir \