From: Mike Taylor <mike@indexdata.com>
Date: Fri, 13 Apr 2012 11:42:35 +0000 (+0100)
Subject: Do not try to rm OMIT_FROM_DIST files if they don't exist.
X-Git-Url: http://jira.indexdata.com/?a=commitdiff_plain;h=2bcec6e9759afb8ab7d09b38c808239ebee29b13;p=git-tools-moved-to-github.git

Do not try to rm OMIT_FROM_DIST files if they don't exist.
Mainly to avoid spurious warning about absent "debian" directory.
---

diff --git a/id-deb-build/mkdist.sh b/id-deb-build/mkdist.sh
index 4fbee88..473013e 100755
--- a/id-deb-build/mkdist.sh
+++ b/id-deb-build/mkdist.sh
@@ -42,8 +42,10 @@ git archive --format=tar --prefix=$NAME-$VERSION/ v${VERSION} > tmp.tar || die "
 tar xf tmp.tar
 rm tmp.tar
 for file in debian $OMIT_FROM_DIST; do
-  echo "Omitting $file from distribution"
-  rm -r $NAME-$VERSION/$file
+  if [ -e "$file" ]; then
+    echo "Omitting $file from distribution"
+    rm -r $NAME-$VERSION/$file
+  fi
 done
 tar cfz $NAME-$VERSION.tar.gz $NAME-$VERSION
 rm -r $NAME-$VERSION