Fix DIR= to use parent directory

tresf · Feb 5, 2025 · a88ebc1 · a88ebc1
1 parent b7dc1f2
commit a88ebc1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmake/linux/apprun-hooks/carla-hook.sh b/cmake/linux/apprun-hooks/carla-hook.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Workaround nuances with carla being an optional-yet-hard-linked plugin
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 CARLA_LIB="libcarla_native-plugin.so"
 KNOWN_LOCATIONS=("lib" "lib64")
 

diff --git a/cmake/linux/apprun-hooks/jack-hook.sh b/cmake/linux/apprun-hooks/jack-hook.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Workaround crash when jack is missing by providing a dummy version
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
    echo "Jack appears to be installed on this system, so we'll use it." >&2
 else

diff --git a/cmake/linux/apprun-hooks/usr-lib-hooks.sh b/cmake/linux/apprun-hooks/usr-lib-hooks.sh
@@ -2,7 +2,7 @@
 
 # Workaround libraries being incorrectly placed in usr/lib (e.g. instead of usr/lib/lmms, etc)
 # FIXME: Remove when linuxdeploy supports subfolders https://github.com/linuxdeploy/linuxdeploy/issues/305
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 export LMMS_PLUGIN_DIR="$DIR/usr/lib/"
 export LADSPA_PATH="$DIR/usr/lib/"
 export SUIL_MODULE_DIR="$DIR/usr/lib/"