diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-19 22:03:07 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-19 22:03:07 +0300 |
| commit | 00d39afd5820063b2b98b0070138ea28ce2b18b5 (patch) | |
| tree | 3cb2e82bb2818ad84aad484b1f1af15f80ee6a8b /scripts | |
| parent | 49b2d8509efc14ad92281b8b000149a7bb003b3f (diff) | |
FIX(client/overlay): Update unix script to use the current library names
The overlay script did not use the current library names of the overlay
libs. So when installing, the libraries had to be renamed or the script
edited for it to work.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mumble-overlay | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/scripts/mumble-overlay b/scripts/mumble-overlay index 831525cb4..f512c5c98 100755 --- a/scripts/mumble-overlay +++ b/scripts/mumble-overlay @@ -12,12 +12,13 @@ fi for libpath in /usr/lib /usr/lib/mumble /usr/lib32 /usr/lib32/mumble /usr/lib64 /usr/lib64/mumble; do if [ -d "$libpath" ]; then - if [ -f "$libpath/libmumble.so.1" ]; then - case $(file -L "$libpath/libmumble.so.1") in - *64-bit*) MUMBLE_OVERLAY_PATH_64="$libpath" ; echo set ;; - *32-bit*) MUMBLE_OVERLAY_PATH_32="$libpath" ;; + for lib in $libpath/libmumbleoverlay*.so + do + case $(file -L "$lib") in + *64-bit*) MUMBLE_OVERLAY_PATH_64="$lib" ; echo set ;; + *32-bit*) MUMBLE_OVERLAY_PATH_32="$lib" ;; esac - fi + done fi done @@ -40,27 +41,27 @@ is32=no case $(file -L "$binary") in *64-bit*) if [ -z "${MUMBLE_OVERLAY_PATH_64}" ]; then - echo "64-bit libmumble.so.1 not found" >&2 + echo "64-bit libmumbleoverlay.so not found" >&2 exit 1 fi - MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_64}/libmumble.so.1" + MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_64}" ;; *32-bit*) if [ -z "${MUMBLE_OVERLAY_PATH_32}" ]; then - echo "32-bit libmumble.so.1 not found" >&2 + echo "32-bit libmumbleoverlay.so not found" >&2 exit 1 fi - MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_32}/libmumble.so.1" + MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_32}" ;; *) if [ -n "${MUMBLE_OVERLAY_PATH_64}" ]; then - MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_64}/libmumble.so.1" + MUMBLE_PRELOAD="${MUMBLE_OVERLAY_PATH_64}" fi if [ -n "${MUMBLE_OVERLAY_PATH_32}" ]; then - MUMBLE_PRELOAD="${MUMBLE_PRELOAD} ${MUMBLE_OVERLAY_PATH_32}/libmumble.so.1" + MUMBLE_PRELOAD="${MUMBLE_PRELOAD} ${MUMBLE_OVERLAY_PATH_32}" fi if [ -z "${MUMBLE_PRELOAD}" ]; then - echo "Neither 32-bit or 64-bit libmumble.so.1 found" + echo "Neither 32-bit or 64-bit libmumbleoverlay.so found" exit 1 fi esac |