From 604882e9517b5fe64aaa18feb0f042c2f32c02ec Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 5 Oct 2019 03:33:51 +0800 Subject: [PATCH] ceph-dev-new-build: do not 'cd ceph-*' on cenos8, we will have $ cd ceph-15.0.0-5635-gda7c5f3 ceph-15.0.0-5635-gda7c5f3.tar.bz2 ceph-15.0.0-5635-gda7c5f3.tar.gz /tmp/jenkins8338985937861239310.sh: line 1055: cd: too many arguments Signed-off-by: Kefu Chai --- ceph-dev-new-build/build/setup_deb | 2 +- ceph-dev-new-build/build/setup_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb index 08b24525..02601ba1 100644 --- a/ceph-dev-new-build/build/setup_deb +++ b/ceph-dev-new-build/build/setup_deb @@ -26,7 +26,7 @@ $SUDO apt-get install -y lsb-release # unpack the tar.gz that contains the debian dir cd dist tar xzf *.orig.tar.gz -cd ceph-* +cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/) pwd BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 789dbea3..19da8184 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -26,7 +26,7 @@ $SUDO yum install -y redhat-lsb-core # unpack the tar.gz that contains the debian dir cd dist tar xzf *.orig.tar.gz -cd ceph-* +cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/) pwd $SUDO yum install -y yum-utils -- 2.39.5