fix: use BIC_OVERWRITE when cping static/ too

.github/workflows/ci.yml

@@ -15,15 +15,15 @@ on:
 
 env:
   IMAGE_NAME: bic
-  PANDOC_VERSION: 2.17.0.1
-  BATS_VERSION: 1.5.0
+  PANDOC_VERSION: 3.2.1
+  BATS_VERSION: 1.11.0
 
 jobs:
   # Run tests.
   # See also https://docs.docker.com/docker-hub/builds/automated-testing/
   test:
     # in sync with Dockerfile
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-ENV PANDOC_VERSION=2.17.0.1
+ENV PANDOC_VERSION=3.2.1
 
 RUN apt-get update && apt-get install -y curl tzdata && \
   curl -sL https://github.com/jgm/pandoc/releases/download/$PANDOC_VERSION/pandoc-$PANDOC_VERSION-1-amd64.deb -o pandoc-$PANDOC_VERSION.deb && \

bic

@@ -366,7 +366,12 @@ build_feed() {
 build_static() {
   [[ ! -d "${SRC_DIR}"/static ]] && return
   log "Building /static -> /"
-  cp -a "${SRC_DIR}"/static/. "${DEST_DIR}"
+  # Archive by default
+  local args=(-a)
+  # And run interactively so as to not clobber files unless explicitly disabled
+  [[ -z "${BIC_OVERWRITE:-}" ]] && args+=(-i)
+  # shellcheck disable=SC2216
+  echo n | cp "${args[@]}" "${SRC_DIR}"/static/. "${DEST_DIR}"
 }
 
 build() {
@@ -376,7 +381,7 @@ build() {
   [[ "${SRC_DIR}" != "${__dir}" ]] && [[ -f "${SRC_DIR}"/.env ]] && src "${SRC_DIR}"/.env && log "Custom .env sourced"
   DEST_DIR="${SRC_DIR}/${BUILD_DIR:-build}"
   log "Using source directory: ${SRC_DIR}"
-  [[ -n "${BIC_OVERWRITE:-}" ]] && set +o noclobber && log "Disabled 'noclobber' redirection overwrite protection"
+  [[ -n "${BIC_OVERWRITE:-}" ]] && set +o noclobber && warn "Disabled overwrite protection"
 
   # File system: what's missing and do we need to bail?
   [[ -d "${SRC_DIR}"/pages && -f "${SRC_DIR}"/page.html  ]] || warn "pages/ + page.html for pages"

docs/index.md

@@ -66,7 +66,7 @@ generated site.
 
 ## Structure
 
-For a fully-featured example, view the demo source code: <https://github.com/Pinjasaur/bic-example>
+For a fully-featured example, view the [demo] source code: <https://github.com/Pinjasaur/bic-example>
 
 ```plaintext
 $ tree -F --dirsfirst
@@ -169,10 +169,11 @@ There is an order-of-operations for how files are built, as follows:
 - `feed.rss`
 - static e.g. `static/*` &rarr; `/`
 
-If you're not careful, it's possible you could overwrite an existing
-file e.g. `pages/test.md` and `posts/999-test.md` both map to `/test.html`. `bic`
-uses the Bash builtin `noclobber` e.g. `set -o noclobber` to help prevent these
-situations. This can be disabled by setting `BIC_OVERWRITE`.
+If you're not careful, it's possible you could overwrite an existing file e.g.
+`pages/test.md` and `posts/999-test.md` both map to `/test.html`. `bic` uses the
+Bash builtin `noclobber` e.g. `set -o noclobber` along with `--interactive` for
+`cp` to protect against these scenarios. This can be disabled by setting
+`BIC_OVERWRITE`. You've been warned.
 
 ## Showcase
 
@@ -181,6 +182,7 @@ situations. This can be disabled by setting `BIC_OVERWRITE`.
 - the demo: <https://demo.bic.sh/>
 - Mitch's blog: <https://fossen.dev/>
 - Evan's blog: <https://evanhstanton.github.io/>
+- you?
 
 ## Support
 

lib/mo

@@ -235,7 +235,7 @@ mo::debugShowState() {
     if [[ -z "${MO_DEBUG:-}" ]]; then
         return
     fi
-
+   
     local moState moTemp moIndex moDots
 
     mo::escape moTemp "$MO_OPEN_DELIMITER"
@@ -258,7 +258,7 @@ mo::debugShowState() {
     moState="$moState  parsed: $moDots$moTemp"
 
     moDots=...
-
+    
     if [[ "${#MO_UNPARSED}" -le 20 ]]; then
         moDots=
     fi
@@ -341,7 +341,7 @@ mo::content() {
         mo::debug "Will read content from stdin"
         mo::contentFile moContent || return 1
     fi
-
+    
     local "$moTarget" && mo::indirect "$moTarget" "$moContent"
 }
 
@@ -665,7 +665,7 @@ mo::parseBlockArray() {
     moCloseDelimiterAfter=$MO_CLOSE_DELIMITER
     moArrayName=${moTokens[1]}
     eval "moArrayIndexes=(\"\${!${moArrayName}[@]}\")"
-
+    
     if [[ "${#moArrayIndexes[@]}" -lt 1 ]]; then
         #: No elements
         if [[ "$moInvertBlock" == "true" ]]; then
@@ -1002,13 +1002,24 @@ mo::isArrayIndexValid() {
 # Can not use logic like this in case invalid variable names are passed.
 #     [[ "${!1-a}" == "${!1-b}" ]]
 #
+# Using logic like this gives false positives.
+#     [[ -v "$a" ]]
+#
+# Declaring a variable is not the same as assigning the variable.
+#     export x
+#     declare -p x   # Output: declare -x x
+#     export y=""
+#     declare -p y   # Output: declare -x y=""
+#     unset z
+#     declare -p z   # Error code 1 and output: bash: declare: z: not found
+#
 # Returns true (0) if the variable is set, 1 if the variable is unset.
 mo::isVarSet() {
-    if ! declare -p "$1" &> /dev/null; then
-        return 1
+    if declare -p "$1" &> /dev/null && [[ -v "$1" ]]; then
+        return 0
     fi
 
-    return 0
+    return 1
 }
 
 
@@ -1587,7 +1598,7 @@ mo::getContentUntilClose() {
                     MO_UNPARSED=${MO_UNPARSED:1}
                     mo::getContentTrim moTemp
                     mo::getContentWithinTag moTemp "$MO_CLOSE_DELIMITER"
-
+                    
                     if [[ "${moTagStack[0]}" == "${moTemp[1]}" ]]; then
                         moResultTemp="$moResultTemp${moTemp[0]}"
                         moTagStack=("${moTagStack[@]:1}")
@@ -1674,7 +1685,7 @@ mo::tokensToString() {
 # Returns nothing.
 mo::getContentTrim() {
     local moChar moResult
-
+    
     moChar=${MO_UNPARSED:0:1}
     moResult=""
 
@@ -1977,7 +1988,7 @@ mo::tokenizeTagContentsSingleQuote() {
 
 # Save the original command's path for usage later
 MO_ORIGINAL_COMMAND="$(cd "${BASH_SOURCE[0]%/*}" || exit 1; pwd)/${BASH_SOURCE[0]##*/}"
-MO_VERSION="3.0.6"
+MO_VERSION="3.0.7"
 
 # If sourced, load all functions.
 # If executed, perform the actions as expected.

tests/overwrite-static/entry.html

@@ -0,0 +1 @@
+{{{body}}}

tests/overwrite-static/page.html

@@ -0,0 +1 @@
+{{{body}}}

tests/overwrite-static/posts/999-test.md

@@ -0,0 +1,3 @@
+# Test
+
+post

tests/overwrite-static/static/test.html

@@ -0,0 +1 @@
+<p>static</p>

tests/test.bats

@@ -25,8 +25,9 @@
 
 @test "bic copies static/ correctly" {
   run ./bic tests/static
-  [[ -f tests/static/build/humans.txt ]]
   [[ "${status}" == 0 ]]
+  [[ -f tests/static/build/humans.txt ]]
+  [[ -f tests/static/build/foo/bar/baz ]]
   rm -rf tests/static/build
   [[ ! -d tests/static/build ]]
 }
@@ -75,6 +76,16 @@
   [[ ! -d tests/overwrite/build ]]
 }
 
+@test "bic will not overwrite by default (static)" {
+  run ./bic tests/overwrite-static
+  [[ -f tests/overwrite-static/build/test.html ]]
+  [[ "${status}" != 0 ]] # errored out trying to overwrite test.html
+  run cat tests/overwrite-static/build/test.html
+  [[ "${lines[0]}" == "<p>post</p>" ]]
+  rm -rf tests/overwrite-static/build
+  [[ ! -d tests/overwrite-static/build ]]
+}
+
 @test "bic will overwrite if specified" {
   BIC_OVERWRITE=1 run ./bic tests/overwrite
   [[ -f tests/overwrite/build/test.html ]]
@@ -85,6 +96,16 @@
   [[ ! -d tests/overwrite/build ]]
 }
 
+@test "bic will overwrite if specified (static)" {
+  BIC_OVERWRITE=1 run ./bic tests/overwrite-static
+  [[ -f tests/overwrite-static/build/test.html ]]
+  [[ "${status}" == 0 ]] # didn't error out
+  run cat tests/overwrite-static/build/test.html
+  [[ "${lines[0]}" == "<p>static</p>" ]]
+  rm -rf tests/overwrite-static/build
+  [[ ! -d tests/overwrite-static/build ]]
+}
+
 @test "bic will honor a custom \$BUILD_DIR" {
   BUILD_DIR=_site run ./bic tests/index.html
   [[ -f tests/index.html/_site/index.html ]]