import Ceph Pacific 16.2.4

[ceph.git] / ceph / make-debs.sh

diff --git a/ceph/make-debs.sh b/ceph/make-debs.sh
index 705d88de38c42a32fec79938209d8438a417c0bd..5a7ca1aff5c8bd5932a656393b3066ed530350af 100755 (executable)
--- a/ceph/make-debs.sh
+++ b/ceph/make-debs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2015 Red Hat <contact@redhat.com>
 #
@@ -19,7 +19,7 @@ set -xe
 base=${1:-/tmp/release}
 codename=$(lsb_release -sc)
 releasedir=$base/$(lsb_release -si)/WORKDIR
-rm -fr $releasedir
+rm -fr $(dirname $releasedir)
 mkdir -p $releasedir
 #
 # remove all files not under git so they are not
@@ -79,7 +79,7 @@ cat > $codename/conf/distributions <<EOF
 Codename: $codename
 Suite: stable
 Components: main
-Architectures: i386 amd64 source
+Architectures: $(dpkg --print-architecture) source
 EOF
 if [ ! -e conf ]; then
     ln -s $codename/conf conf