support: ensure git tree properly cleaned.

diff --git a/support/launchpad-ppa b/support/launchpad-ppa
index c3f5936e865b46ac8f45bc60a701ca4228055fab..ff367d04255398a01cb72cbbbdc08c05c71edf14 100755 (executable)
--- a/support/launchpad-ppa
+++ b/support/launchpad-ppa
@@ -26,11 +26,14 @@ TVH_ROOT=$(cd $(dirname $0)/..; pwd)
 
 # Setup
 cd $TVH_ROOT || exit 1
-git checkout $1 && git checkout . || exit 1
 NOW=`date -R`
 CHANGELOG=$TVH_ROOT/debian/changelog
 VERFILE=$TVH_ROOT/src/version.c
 
+# Checkout
+git checkout $REL || die "could not checkout $REL"
+git clean -dfx || die "could not clean git tree"
+
 # Create version file
 VER=$($TVH_ROOT/support/version $VERFILE)
 

diff --git a/support/tarball b/support/tarball
index ca65b6646f4b72b4684d3220e76b3d916e92dd6a..2d5b809e145a797f70dc5edc716e56cbfbd398b7 100755 (executable)
--- a/support/tarball
+++ b/support/tarball
@@ -16,12 +16,12 @@ cd $SRCDIR
 
 # Arguments
 REL=$1
+
+# Checkout
 if [ ! -z "$REL" ]; then
   git checkout $REL || die "could not checkout $REL"
 fi
-
-# Clean
-git checkout . || die "could not clean git tree"
+git clean -dfx || die "could not clean git tree"
 
 # Version
 VER=$(./support/version)