From: Kevin Day <thekevinday@gmail.com>
Date: Wed, 28 Apr 2021 04:46:01 +0000 (-0500)
Subject: Bugfix: Setting path_headers_preserve should still honor path_headers setting.
X-Git-Tag: 0.5.3~6
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=64654eda938253f6a2fcd8cd30835e30463b32d9;p=fll

Bugfix: Setting path_headers_preserve should still honor path_headers setting.

When both path_headers_preserve and path_headers are provided, the path_headers should still be used.
---

diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh
index e44bcab..60e90fb 100644
--- a/build/scripts/bootstrap.sh
+++ b/build/scripts/bootstrap.sh
@@ -843,6 +843,20 @@ bootstrap_operation_build() {
           fi
         fi
       done
+    elif [[ $path_headers_preserve == "yes" ]] ; then
+      for i in $sources_headers ; do
+        directory=$(dirname $i)
+
+        if [[ $directory == "." || $path_headers_preserve != "yes" ]] ; then
+          cp $verbose -f $path_c$i ${path_build}includes/$path_headers/ || failure=1
+        else
+          mkdir $verbose -p ${path_build}includes/$path_headers/$directory || failure=1
+
+          if [[ $failure == "" ]] ; then
+            cp $verbose -f $path_c$i ${path_build}includes/$path_headers/$i || failure=1
+          fi
+        fi
+      done
     else
       for i in $sources_headers ; do
         cp $verbose -f $path_c$i ${path_build}includes/$path_headers/ || failure=1