From 33e8afa0e09c182b602d6588329eb7c2f01b2189 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 17 Feb 2017 13:25:17 -0600 Subject: [PATCH] only patch packpack if it is not already patched --- utils/packpack/startpackpack.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index fc0bbb586..117f1c1a9 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -87,7 +87,10 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then echo "Begin Debian build..." # patch packpack to remove "debian" from the source tarball filename - patch -p1 < utils/packpack/deb.mk.patch + patch --dry-run --silent -f -p1 < utils/packpack/deb.mk.patch 2>/dev/null + if [ $? -eq 0 ]; then + patch -p1 < utils/packpack/deb.mk.patch + fi # Uncompress the Crud tarball and move it into place if [ -e "web/api/app/Plugin/Crud/LICENSE.txt" ]; then