From 193bfaef31842392cfbf7b6613a118981011cbc6 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <i@neoascetic.me>
Date: Tue, 12 Mar 2024 15:22:30 +0200
Subject: [PATCH] Use bash from env; allow empty vars

---
 jopa    | 16 ++++++++--------
 my-jopa |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jopa b/jopa
index 9748579..4d94851 100755
--- a/jopa
+++ b/jopa
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-export from=${from:-"$PWD/pages"}
-export to=${to:-"$PWD/www"}
-export ext=${ext:-"html"}
-export indexes=${indexes:-"$from/index.jsh"}
-export layout_file=${layout_file:-"layout.jsh"}
-export pages=${pages:-"$from/*.jsh"}
+export from=${from-"$PWD/pages"}
+export to=${to-"$PWD/www"}
+export ext=${ext-".html"}
+export indexes=${indexes-"$from/index.jsh"}
+export layout_file=${layout_file-"layout.jsh"}
+export pages=${pages-"$from/*.jsh"}
 
 multiline() { # multiline [markdown] varname << 'JOPA'
   if [[ "$#" -eq 2 ]]; then 
@@ -20,7 +20,7 @@ page_id() { echo "_page_env_${1//[^a-zA-Z0-9]/_}"; }
 read_page() {
   set -a
   src="${1##*/}"
-  target="${src%.*}.$ext"
+  target="${src%.*}$ext"
   source "$1" >&2
 }
 store_page() { printf -v $(page_id $1) '%s' "$(read_page $1; declare -px)"; }
diff --git a/my-jopa b/my-jopa
index 4f5fa4f..e4ca893 100755
--- a/my-jopa
+++ b/my-jopa
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source jopa