From 0dbc8f895b0882d0dc9205a0288c60276ac31481 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 26 Jul 2020 22:16:13 +0100
Subject: [PATCH] Some fixes needed for jack builds

---
 build-jack.sh      | 4 ++--
 setup/functions.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-jack.sh b/build-jack.sh
index 1c14e68..b30571e 100755
--- a/build-jack.sh
+++ b/build-jack.sh
@@ -195,11 +195,11 @@ fi
 build_waf jack2 "${JACK2_VERSION}" "${jack2_args}"
 
 # remove useless dbus-specific file
-rm "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/bin/jack_control"
+rm -f "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/bin/jack_control"
 
 # copy jack pkg-config file to main system, so qjackctl can find it
 if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc" ]; then
-    cp -v "${PAWPAW_PREFIX}/jack2/${jack2_extra_prefix}lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
+    cp -v "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
 
     # patch pkg-config file for static win32 builds in regular prefix
     if [ "${WIN32}" -eq 1 ]; then
diff --git a/setup/functions.sh b/setup/functions.sh
index 710e6cd..ce41910 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -501,7 +501,7 @@ function remove_file() {
 
     local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
 
-    if [ ! -e "${pkgdir}/${file}" ]; then
+    if [ -e "${pkgdir}/${file}" ]; then
         rm -fv "${pkgdir}/${file}"
     fi
 }