bug7_gitapply_nogit.patch

# Björn Bidar <theodortormgrade@gmail.com>
# fiy #7 "git apply" fails silently under specific conditions

--- a/patches/patchinstall.sh   2015-01-10 22:27:16.000000000 +0100
+++ b/patches/patchinstall.sh   2015-01-12 06:12:32.045926414 +0100
@@ -659,15 +659,23 @@

 # Apply the patches using gitapply.sh, a small wrapper around 'patch'
 if test "$backend" = "patch"; then
-
-       patch_apply ()
-       {
-               echo "Applying $1"
+  if [ -d "$DESTDIR/.git" ] || (cd $DESTDIR ;git rev-parse --git-dir) > /dev/null 2>&1 ; then
+       patch_apply ()
+       {
+               echo "Applying $1"
+               if ! ../debian/tools/gitapply.sh --notgit -d "$DESTDIR" < "$1"; then
+                       abort "Failed to apply patch, aborting!"
+               fi
+       }
+  else
+       patch_apply ()
+       {
+               echo "Applying $1"
                if ! ../debian/tools/gitapply.sh -d "$DESTDIR" < "$1"; then
                        abort "Failed to apply patch, aborting!"
                fi
-       }
-
+       }
+  fi
 # GIT backend - apply patches using 'git am'
 elif test "$backend" = "git" -o "$backend" = "git-am"; then