Skip to content
Permalink
Browse files

run remove_temporary_files.sh in prepare-commit.sh

  • Loading branch information
jef-n committed Feb 2, 2016
1 parent 0512538 commit 1a817e58a6bc99326be13fa6cca8d2042311a3eb
Showing with 18 additions and 13 deletions.
  1. +2 −2 scripts/prepare-commit.sh
  2. +16 −11 scripts/remove_temporary_files.sh
@@ -15,7 +15,7 @@
###########################################################################


PATH=$PATH:$(git rev-parse --show-toplevel)/scripts
PATH=$(git rev-parse --show-toplevel)/scripts:$PATH

if ! type -p astyle.sh >/dev/null; then
echo astyle.sh not found
@@ -31,7 +31,7 @@ fi

if [ "$1" = "-c" ]; then
echo "Cleaning..."
find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" -o -name "*.bom" \) -print -delete
remove_temporary_files.sh
fi

set -e
@@ -16,16 +16,21 @@

#
# A simple script to get rid of QGIS related temporary files left in
# your QGIS source folder by git and the prepare-commit script
# if you don't want to use "prepare-commit.sh -c"
# your QGIS source folder by git

# Tim Sutton, May 2008
find . -name "*.orig" -delete
find . -name "*.prepare" -delete
find . -name "*.sortinc" -delete
find . -name "astyle*.diff" -delete
find . -name "*.astyle" -delete
find . -name "sha*.diff" -delete
find . -name "*~" -delete


find . \
\( \
-name "*.orig" \
-o -name "*.prepare" \
-o -name "*.sortinc" \
-o -name "*.nocopyright" \
-o -name "astyle*.diff" \
-o -name "sha-*.diff" \
-o -name "*.astyle" \
-o -name "sha*.diff" \
-o -name "*.bom" \
-o -name "*~" \
\) \
-print \
-delete

0 comments on commit 1a817e5

Please sign in to comment.
You can’t perform that action at this time.