From c56142cf5710c7b04f505855bbcac682f60ed24b Mon Sep 17 00:00:00 2001
From: Ari Archer <ari.web.xyz@gmail.com>
Date: Wed, 1 Mar 2023 23:15:54 +0200
Subject: [PATCH] 7.4.0 : remove support for BAZ_LOADER_PROG_BIN and DESTDIR

Signed-off-by: Ari Archer <ari.web.xyz@gmail.com>
---
 README.md | 12 ------------
 baz       | 12 ++++--------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 27c49a0..2c94c3c 100644
--- a/README.md
+++ b/README.md
@@ -136,18 +136,6 @@ export STRIP='llvm-strip'
 export STRIPFLAGS='--remove-section=.note --strip-all'
 ```
 
--   set the `load` binary path
-
-```bash
-export BAZ_LOADER_PROG_BIN='/some/load'
-```
-
--   set the `load` binary path destination
-
-```bash
-export DESTDIR='/some/dir/'
-```
-
 -   install the script anywhere, or even run it standalone
     -   running standalone means just running it
     -   installing could be done in for example `/usr/local/bin`:
diff --git a/baz b/baz
index 08308bb..8b5c03e 100755
--- a/baz
+++ b/baz
@@ -2,7 +2,7 @@
 
 [ "$BAZ_DEBUG" ] && set -x
 
-export BAZ_VERSION='7.3.0'
+export BAZ_VERSION='7.4.0'
 export BAZ_DIR="$HOME/.local/share/baz"
 export BAZ_CONFDIR="$HOME/.config/baz"
 export BAZ_CONF="$BAZ_CONFDIR/config.env"
@@ -28,7 +28,7 @@ export BAZ_BASH_LOADER_TEMPLATE="$BAZP_INITDIR/loader.sht"
 export BAZ_LOADER_DIR="$BAZP_INITDIR/loader"
 export BAZ_LOADER_TEMPLATE="$BAZ_LOADER_DIR/loader.sht"
 export BAZ_LOADER_PROG="$BAZ_LOADER_DIR/loader.c"
-export BAZ_LOADER_PROG_BIN="${BAZ_LOADER_PROG_BIN:-"$BAZ_DIR/load"}"
+export BAZ_LOADER_PROG_BIN="$BAZ_DIR/load"
 
 export BAZ_LOGGING_HEADER='[BAZ_LOAD]'
 
@@ -629,15 +629,11 @@ baz_setup() {
 
         baz_log "compiling loader $(baz_unexpand_path "$BAZ_LOADER_PROG_BIN") ... " printf
 
-        if [ "$DESTDIR" ]; then
-            mkdir -p -- "$DESTDIR" || baz_eecho 'failed to make destdir'
-        fi
-
         # shellcheck disable=SC2086
-        if "$CC" $CFLAGS "$BAZ_LOADER_PROG" $([ "$BAZ_LOGGING_ENABLED" ] && echo "-D LOGGING=\"\\\"$BAZ_LOGGING_HEADER\\\"\"") -o "$DESTDIR$BAZ_LOADER_PROG_BIN"; then
+        if "$CC" $CFLAGS "$BAZ_LOADER_PROG" $([ "$BAZ_LOGGING_ENABLED" ] && echo "-D LOGGING=\"\\\"$BAZ_LOGGING_HEADER\\\"\"") -o "$BAZ_LOADER_PROG_BIN"; then
             if [ "$STRIP" ] && do_error=no baz_use "$STRIP"; then
                 # shellcheck disable=SC2086
-                "$STRIP" $STRIPFLAGS "$DESTDIR$BAZ_LOADER_PROG_BIN" || baz_eecho 'stripping failed'
+                "$STRIP" $STRIPFLAGS "$BAZ_LOADER_PROG_BIN" || baz_eecho 'stripping failed'
             fi
 
             baz_eecho 'done'