From a09ec1d02b275fa0d79a0a21be77d450fd86318b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 4 Oct 2025 02:55:52 +0100 Subject: xbmk: remove more eval statements i will eventually find a way to remove them all, while still leaving the code completely clean. in practise, i never use the contents of a file for eval and the inputs are carefully checked. however, over-use of eval is always a bad idea in shell scripting. Signed-off-by: Leah Rowe --- include/get.sh | 19 +++++++++++++++---- include/release.sh | 6 +++++- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/get.sh b/include/get.sh index 20cf7c90..db61958b 100644 --- a/include/get.sh +++ b/include/get.sh @@ -3,8 +3,15 @@ # Copyright (c) 2020-2021,2023-2025 Leah Rowe # Copyright (c) 2022 Caleb La Grange -eval "`setvars "" loc url bkup_url subcurl subhash subgit subgit_bkup \ - depend subcurl_bkup`" +depend="" +loc="" +url="" +bkup_url="" +subgit="" +subgit_bkup="" +subcurl="" +subcurl_bkup="" +subhash="" tmpgit="$xbtmp/gitclone" tmpgitcache="$xbtmp/tmpgit" @@ -76,8 +83,12 @@ fetch_submodule() { mcfgdir="$mdir/${1##*/}" - eval \ - "`setvars "" subhash subgit subgit_bkup subcurl subcurl_bkup st`" + subhash="" + subgit="" + subgit_bkup="" + subcurl="" + subcurl_bkup="" + st="" eval "`setcfg "$mcfgdir/module.cfg" 0`" diff --git a/include/release.sh b/include/release.sh index f1783dcf..a2eb28a6 100644 --- a/include/release.sh +++ b/include/release.sh @@ -2,7 +2,11 @@ # Copyright (c) 2023-2025 Leah Rowe -eval "`setvars "" reldir reldest vdir rsrc relmode`" +reldir="" +reldest="" +vdir="" +rsrc="" +relmode="" release() { -- cgit v1.2.1