From 940c9fa430199725a750f500b32d656c3a91e3cf Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 14 Mar 2022 15:18:45 +0800 Subject: [PATCH 1/1] speech_tools-no-LD_LIBRARY_PATH-extension --- speech_tools/scripts/shared_script | 19 ------------------- speech_tools/scripts/shared_setup_prl | 8 -------- speech_tools/scripts/shared_setup_sh | 18 ------------------ 3 files changed, 45 deletions(-) diff --git a/speech_tools/scripts/shared_script b/speech_tools/scripts/shared_script index ca3e1b5..5c17b7e 100644 --- a/speech_tools/scripts/shared_script +++ b/speech_tools/scripts/shared_script @@ -1,24 +1,5 @@ #!/bin/sh -# EST shared script - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__LIB__:__LDPATH__" - exec __MAIN__/__PROGRAM__ "$@" exit 0 diff --git a/speech_tools/scripts/shared_setup_prl b/speech_tools/scripts/shared_setup_prl index eba11ff..139597f 100644 --- a/speech_tools/scripts/shared_setup_prl +++ b/speech_tools/scripts/shared_setup_prl @@ -1,10 +1,2 @@ -if (defined($ENV{LD_LIBRARY_PATH})) - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}"; - } -else - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib"; - } diff --git a/speech_tools/scripts/shared_setup_sh b/speech_tools/scripts/shared_setup_sh index 64f0ba9..139597f 100644 --- a/speech_tools/scripts/shared_setup_sh +++ b/speech_tools/scripts/shared_setup_sh @@ -1,20 +1,2 @@ -# EST shared setup - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__TOP__/lib:__LDPATH__" -- 2.30.0