bin/mdw-build: Accept a `.git' directory as a top-level.

[profile] / bin / mdw-build

diff --git a/bin/mdw-build b/bin/mdw-build
index 34b6383..5ea9e12 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -137,7 +137,8 @@ yesno () {
 ### Do the building.
 
 ## Find the top-level package directory.
-while [ ! -f configure.ac -a ! -f configure.in -a ! -f .links ]; do
+while [ ! -f configure.ac -a ! -f configure.in -a \
+       ! -f .links -a ! -d .git ]; do
   case "$(pwd)" in
     /)
       fail "couldn't find top-level directory"
@@ -246,7 +247,7 @@ esac
 
 cd $releasepath
 
-if ! tar tfz $buildpath/$distdir.tar.gz | grep -q RELEASE; then
+if ! tar tf $buildpath/$distdir.tar.gz 2>/dev/null | grep -q RELEASE; then
   fail "missing RELEASE file in distribution"
 fi
 
@@ -269,10 +270,10 @@ case "$upload,$build" in
     ;;
   yes,release)
     run rsync $distdir.tar.gz \
-      $(mdw-conf upload-target metalzone.distorted.org.uk:/home/ftp/pub/mdw/)
+      $(mdw-conf upload-target ftp.distorted.org.uk:~ftp/pub/mdw/)
     case "$debian" in
       yes)
-       run dput -f $(mdw-conf dput-target metalzone) *.changes
+       run dput -f $(mdw-conf dput-target distorted) *.changes
        ;;
     esac
 esac