From 6f92332efaa9d68fa201c93fc9a271bee4cb500e Mon Sep 17 00:00:00 2001 From: Nat! Date: Wed, 12 Apr 2023 17:10:37 +0200 Subject: [PATCH] fix include statements for project::foo-bar, where the - was parsed incorrectly --- src/mulle-bashfunctions-all.sh | 2 +- src/mulle-bashfunctions-minimal.sh | 2 +- src/mulle-bashfunctions-none.sh | 2 +- src/mulle-bashfunctions.sh | 2 +- src/mulle-bashloader.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mulle-bashfunctions-all.sh b/src/mulle-bashfunctions-all.sh index 4147031..57477ae 100755 --- a/src/mulle-bashfunctions-all.sh +++ b/src/mulle-bashfunctions-all.sh @@ -276,7 +276,7 @@ then local namespace - case "${s}" in + case "${tool}" in *-*) namespace="${tool%%-*}" tool="${tool#*-}" diff --git a/src/mulle-bashfunctions-minimal.sh b/src/mulle-bashfunctions-minimal.sh index f582d07..bc1c13b 100755 --- a/src/mulle-bashfunctions-minimal.sh +++ b/src/mulle-bashfunctions-minimal.sh @@ -276,7 +276,7 @@ then local namespace - case "${s}" in + case "${tool}" in *-*) namespace="${tool%%-*}" tool="${tool#*-}" diff --git a/src/mulle-bashfunctions-none.sh b/src/mulle-bashfunctions-none.sh index 0147351..b491a28 100755 --- a/src/mulle-bashfunctions-none.sh +++ b/src/mulle-bashfunctions-none.sh @@ -276,7 +276,7 @@ then local namespace - case "${s}" in + case "${tool}" in *-*) namespace="${tool%%-*}" tool="${tool#*-}" diff --git a/src/mulle-bashfunctions.sh b/src/mulle-bashfunctions.sh index a884b65..189f402 100755 --- a/src/mulle-bashfunctions.sh +++ b/src/mulle-bashfunctions.sh @@ -276,7 +276,7 @@ then local namespace - case "${s}" in + case "${tool}" in *-*) namespace="${tool%%-*}" tool="${tool#*-}" diff --git a/src/mulle-bashloader.sh b/src/mulle-bashloader.sh index 7b30028..9b94a03 100755 --- a/src/mulle-bashloader.sh +++ b/src/mulle-bashloader.sh @@ -161,7 +161,7 @@ then local namespace - case "${s}" in + case "${tool}" in *-*) namespace="${tool%%-*}" tool="${tool#*-}"