From 89551f9b820cf62abb1f4a1fc43bc98d8d23ef50 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 21 Jan 2021 16:33:33 +0100 Subject: [PATCH] python3-wrapper: Update wrapper scripts Use individual wrapper scripts instead of a hardlinked prototype which forwards to $(basename "$0"), because this doesn't work if the user links or hardlinks the wrapper to an unexpected command not available in the package. --- python3-wrapper.be0 | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/python3-wrapper.be0 b/python3-wrapper.be0 index 59e2977bf..152998056 100755 --- a/python3-wrapper.be0 +++ b/python3-wrapper.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION python3-wrapper-1.1-0 +# BEE_VERSION python3-wrapper-1.2-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -57,20 +57,15 @@ SRCURL[0]="" # bee_configure #} -mee_build() { - echo -e '#! /bin/bash\nprun python3 "$(basename "$0")" "$@"' >wrapper - chmod +x wrapper -} +#mee_build() { +# bee_build +#} create_bin_wrapper() { cmd="$1" - target="$2" - if [ -z "$target" ]; then - ln "$B/wrapper" "$D$BINDIR/$cmd" - else - echo -e "#! /bin/bash\nprun python3 \"$target\" \"\$@\"" > "$D$BINDIR/$cmd" - chmod +x "$D$BINDIR/$cmd" - fi + target="${2:-$1}" + echo -e "#! /bin/bash\nprun python3 \"$target\" \"\$@\"" > "$D$BINDIR/$cmd" + chmod +x "$D$BINDIR/$cmd" } mee_install() { @@ -104,10 +99,9 @@ mee_install() { rst2s5.py \ rstpep2html.py do - ln "$B/wrapper" "$D$BINDIR/$cmd" + create_bin_wrapper $cmd done } -## by default this may be 'make install DESTDIR="${D}"' ############################################################################### ##