mirror of
https://github.com/scylladb/scylladb.git
synced 2026-06-09 08:23:29 +00:00
dist: support glob pattern on do_install()
Currently do_install() does not function correctly when passing glob pattern & package are already installed. Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
This commit is contained in:
5
dist/redhat/centos_dep/build_dependency.sh
vendored
5
dist/redhat/centos_dep/build_dependency.sh
vendored
@@ -4,10 +4,7 @@ export RPMBUILD=`pwd`/build/rpmbuild
|
||||
do_install()
|
||||
{
|
||||
pkg=$1
|
||||
name=${pkg/%.rpm/}
|
||||
if ! rpm -qs $name >/dev/null 2>&1; then
|
||||
sudo yum install -y $RPMBUILD/RPMS/x86_64/$pkg || sudo yum install -y $RPMBUILD/RPMS/noarch/$pkg
|
||||
fi
|
||||
sudo yum install -y $RPMBUILD/RPMS/*/$pkg 2> build/err || if [ "`cat build/err`" != "Error: Nothing to do" ]; then cat build/err; exit 1;fi
|
||||
echo Install $name done
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user