summaryrefslogtreecommitdiff
path: root/bibisect/buildReleasesRepository.sh
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-10-28 16:25:05 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2019-10-28 16:30:09 +0100
commita16cb416bb45992be120de3c092d9653379b47ca (patch)
treeff7940d78d78b2219497939f5fda3ea305b1339f /bibisect/buildReleasesRepository.sh
parentc6ddc1916db97255e7a6ab0584a942fcec326894 (diff)
Use git add -A instead
thanks to Miklos
Diffstat (limited to 'bibisect/buildReleasesRepository.sh')
-rwxr-xr-xbibisect/buildReleasesRepository.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/bibisect/buildReleasesRepository.sh b/bibisect/buildReleasesRepository.sh
index 464db2d..b0d7705 100755
--- a/bibisect/buildReleasesRepository.sh
+++ b/bibisect/buildReleasesRepository.sh
@@ -36,18 +36,16 @@ do
mv $rootDir/$name/DEBS/opt/$folder/* $rootDir/$name/DEBS/opt/
rm -r $rootDir/$name/DEBS/opt/$folder
rm $rootDir/$name/DEBS/*.deb
- echo "*** Removing unneeded files"
- cd ${targetDir}
- LANG=C diff -qr ${rootDir}/$name/DEBS/opt ${targetDir}/opt | grep -w "Only in ${targetDir}/opt" | sed -r -e 's/^.*Only in //' -e 's@: @/@' | xargs git rm -r
- echo "*** Moving files to bibisect/"
- cd $rootDir
+ echo "*** Cleaning destination"
+ rm -rf ${targetDir}/opt/
+ echo "*** Moving files to destination"
cp -rf $rootDir/$name/DEBS/* ${targetDir}/
echo "*** Removing files in origin"
rm -rf $name
cd ${targetDir}
par1=libreoffice-$input
echo "*** Creating commit $par1"
- git add opt/
+ git add -A opt/
git commit . -m $par1 -m $file
git clean -ffxd
git tag -d $par1