mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian-reloc: rename buld product to the name specified in SCYLLA-VERSION-GEN

Browse Source 
When the product name is other than "scylla", the debian
packaging scripts go over all files that starts with "scylla-"
and change the prefix to be the actual product name.
However, if there are no such files in the directory
the script will fail since the renaming command will
get the wildcard string instrad of an actual file name.
This patch replaces the command with a command with
an equivalent desired effect that only operates on files
if there are any.

Signed-off-by: Eliran Sinvani <eliransin@scylladb.com>
Message-Id: <20191230143250.18101-1-eliransin@scylladb.com>
This commit is contained in:
Eliran Sinvani
2019-12-30 16:32:50 +02:00
committed by Avi Kivity
parent 263385cb4b
commit 21dec3881c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/debian/build_deb.sh vendored
View File

@@ -132,9 +132,9 @@ ln -fv $RELOC_PKG_FULLPATH ../$PRODUCT-server_$SCYLLA_VERSION-$SCYLLA_RELEASE.or
cp -al dist/debian/debian debian
if [ "$PRODUCT" != "scylla" ]; then
for i in debian/scylla-*;do
mv $i ${i/scylla-/$PRODUCT-}
done
# rename all 'scylla-' prefixed artifacts in the debian folder to have the
# product name as a prefix
find debian -maxdepth 1 -name "scylla-*" -exec bash -c 'mv $1 ${1/scylla-/$PRODUCT-}' _ {} \;
fi
ln -fv dist/common/sysconfig/scylla-server debian/$PRODUCT-server.default
REVISION="1"

6
dist/debian/python3/build_deb.sh vendored
View File

@@ -126,9 +126,9 @@ ln -fv $RELOC_PKG_FULLPATH ../$PRODUCT-python3_$SCYLLA_VERSION-$SCYLLA_RELEASE.o
cp -al dist/debian/python3/debian debian
if [ "$PRODUCT" != "scylla" ]; then
for i in debian/scylla-*;do
mv $i ${i/scylla-/$PRODUCT-}
done
# rename all 'scylla-' prefixed artifacts in the debian folder to have the
# product name as a prefix
find debian -maxdepth 1 -name "scylla-*" -exec bash -c 'mv $1 ${1/scylla-/$PRODUCT-}' _ {} \;
fi
REVISION="1"
MUSTACHE_DIST="\"debian\": true, \"product\": \"$PRODUCT\", \"$PRODUCT\": true"