copy when linking fails and move BUILD_DIR default to default.env

birdhouse/default.env

@@ -6,6 +6,8 @@
 # must use single quotes to avoid early expansion before overrides in env.local
 # are applied and must be added to the list of DELAYED_EVAL.
 
+export BUILD_DIR='${COMPOSE_DIR}/build'
+
 export BASH_IMAGE="bash:5.1.4"
 
 # Root directory under which all data persistence should be nested under
@@ -24,6 +26,7 @@ export PAVICS_FQDN_PUBLIC='${PAVICS_FQDN}'
 export DELAYED_EVAL="
   $DELAYED_EVAL
   PAVICS_FQDN_PUBLIC
+  BUILD_DIR
 "
 
 

birdhouse/pavics-compose.sh

@@ -81,8 +81,6 @@ for adir in $AUTODEPLOY_EXTRA_REPOS; do
 done
 export AUTODEPLOY_EXTRA_REPOS_AS_DOCKER_VOLUMES
 
-BUILD_DIR="${BUILD_DIR:-"${COMPOSE_DIR}/build"}"
-
 COMPOSE_FILE="${BUILD_DIR}/docker-compose.yml"
 
 # Keep the compose project name as "birdhouse" by default (no matter where the build directory is located)
@@ -98,7 +96,10 @@ if [ x"$1" = x"up" ]; then
         RELATIVE_FILE_PATH=${FILE#${adir}}
         DEST="${BUILD_DIR}/${CONF_NAME}/${RELATIVE_FILE_PATH#/}"
         mkdir -p "$(dirname "${DEST}")"
-        ln "${FILE}" "${DEST}"
+        if ! ln "${FILE}" "${DEST}"; then
+          echo "${YELLOW}Warning:${NORMAL} unable to link '${FILE}' to '${DEST}'. Attempting to copy instead."
+          cp "${FILE}" "${DEST}"
+        fi
       done
   done