From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Jun 2016 20:47:52 +0000 (-0400)
Subject: make-dist: rename from make_dist.sh
X-Git-Tag: v11.0.0~101^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcaba611176a6e46bf672df6aeafe7ca9aa8e00a;p=ceph-ci.git

make-dist: rename from make_dist.sh

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/make-dist b/make-dist
new file mode 100755
index 00000000000..89781034801
--- /dev/null
+++ b/make-dist
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+
+if [ ! -d .git ]; then
+    echo "no .git present.  run this from the base dir of the git checkout."
+    exit 1
+fi
+
+version=$1
+[ -z "$version" ] && version=`git describe --match 'v*' | sed 's/^v//'`
+outfile="ceph-$version"
+
+echo "version $version"
+
+# update submodules
+echo "updating submodules..."
+force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)
+if ! git submodule sync || ! git submodule update $force --init --recursive; then
+    echo "Error: could not initialize submodule projects"
+    echo "  Network connectivity might be required."
+    exit 1
+fi
+
+# clean out old cruft...
+echo "cleanup..."
+rm -f $outfile*
+
+# build new tarball
+echo "building tarball..."
+bin/git-archive-all.sh --prefix ceph-$version/ \
+		       --verbose \
+		       --ignore corpus \
+		       $outfile.tar
+
+echo "including src/.git_version and src/ceph_ver.h..."
+src/make_version -g src/.git_version -c src/ceph_ver.h
+ln -s . $outfile
+tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/src/ceph_ver.h
+tar --concatenate -f $outfile.both.tar $outfile.version.tar
+tar --concatenate -f $outfile.both.tar $outfile.tar
+mv $outfile.both.tar $outfile.tar
+rm $outfile
+rm -f $outfile.version.tar
+
+echo "compressing..."
+bzip2 -9 $outfile.tar
+
+echo "done."
diff --git a/make_dist.sh b/make_dist.sh
deleted file mode 100755
index 89781034801..00000000000
--- a/make_dist.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-
-if [ ! -d .git ]; then
-    echo "no .git present.  run this from the base dir of the git checkout."
-    exit 1
-fi
-
-version=$1
-[ -z "$version" ] && version=`git describe --match 'v*' | sed 's/^v//'`
-outfile="ceph-$version"
-
-echo "version $version"
-
-# update submodules
-echo "updating submodules..."
-force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)
-if ! git submodule sync || ! git submodule update $force --init --recursive; then
-    echo "Error: could not initialize submodule projects"
-    echo "  Network connectivity might be required."
-    exit 1
-fi
-
-# clean out old cruft...
-echo "cleanup..."
-rm -f $outfile*
-
-# build new tarball
-echo "building tarball..."
-bin/git-archive-all.sh --prefix ceph-$version/ \
-		       --verbose \
-		       --ignore corpus \
-		       $outfile.tar
-
-echo "including src/.git_version and src/ceph_ver.h..."
-src/make_version -g src/.git_version -c src/ceph_ver.h
-ln -s . $outfile
-tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/src/ceph_ver.h
-tar --concatenate -f $outfile.both.tar $outfile.version.tar
-tar --concatenate -f $outfile.both.tar $outfile.tar
-mv $outfile.both.tar $outfile.tar
-rm $outfile
-rm -f $outfile.version.tar
-
-echo "compressing..."
-bzip2 -9 $outfile.tar
-
-echo "done."