From: Dan Mick <dmick@redhat.com>
Date: Tue, 28 Sep 2021 22:23:57 +0000 (-0700)
Subject: Fix tabs vs. spaces, add vim modeline for future vim users
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcc5d8d90a3bb9ec0d5fb58f425ed840acf31b04;p=ceph-build.git

Fix tabs vs. spaces, add vim modeline for future vim users

Signed-off-by: Dan Mick <dmick@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index a5e813d3..5aad4ef3 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# vim: ts=4 sw=4 expandtab
 
 set -ex
 
@@ -947,9 +948,9 @@ build_debs() {
             egrep -v "(Packages|Sources|Contents)" | \
             $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint}
 
-	# extract cephadm binary and push
-	dpkg-deb --fsys-tarfile release/${vers}/cephadm_${vers}*.deb | tar -x -f - --strip-components=3 ./usr/sbin/cephadm
-	echo cephadm | $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint}
+        # extract cephadm binary and push
+        dpkg-deb --fsys-tarfile release/${vers}/cephadm_${vers}*.deb | tar -x -f - --strip-components=3 ./usr/sbin/cephadm
+        echo cephadm | $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint}
 
         # write json file with build info
         cat > $WORKSPACE/repo-extra.json << EOF
@@ -1403,8 +1404,8 @@ setup_rpm_build_deps() {
         $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
         $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
 
-	$SUDO rpm -import https://dist.apache.org/repos/dist/dev/arrow/KEYS
-	$SUDO dnf config-manager --add-repo="https://apache.jfrog.io/artifactory/arrow/centos/${RELEASE}/x86_64"
+        $SUDO rpm -import https://dist.apache.org/repos/dist/dev/arrow/KEYS
+        $SUDO dnf config-manager --add-repo="https://apache.jfrog.io/artifactory/arrow/centos/${RELEASE}/x86_64"
     fi
 
     DIR=/tmp/install-deps.$$
@@ -1496,7 +1497,7 @@ Source0:        ceph.repo
 #Source0:        RPM-GPG-KEY-CEPH
 #Source1:        ceph.repo
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildArch:      noarch
 
 %description
 This package contains the Ceph repository GPG key as well as configuration