yuzu/AppImageKit-checkrt
1
0
Fork 0
mirror of https://github.com/yuzu-emu/AppImageKit-checkrt.git synced 2024-10-18 12:21:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve working directory when launching AppImage

Browse source 
Makes it possible to pass a relative path to the AppImage.

For AppRun.sh all paths inside the AppImage have been switched to use $APPDIR
This commit is contained in:
Kyle Kienapfel 2022-09-25 09:27:49 -07:00
parent 9523470cd9
commit 7447173eb6
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
AppRun.sh
View file

@ -2,42 +2,38 @@
# A shell script that does the same as the binaries in the release section. # A shell script that does the same as the binaries in the release section.
cd "$(dirname "$0")"
cxxpre="" cxxpre=""
gccpre="" gccpre=""
execpre="" execpre=""
libc6arch="libc6,x86-64" libc6arch="libc6,x86-64"
exec="./bin/$(sed -n -e 's|%f||' -e 's|^Exec=||p' $(ls -1 *.desktop))" exec="$APPDIR/usr/bin/$(sed -n -e 's|%f||' -e 's|^Exec=||p' $(ls -1 $APPDIR/*.desktop))"
if [ -n "$APPIMAGE" ] && [ "$(file -b "$APPIMAGE" | cut -d, -f2)" != " x86-64" ]; then if [ -n "$APPIMAGE" ] && [ "$(file -b "$APPIMAGE" | cut -d, -f2)" != " x86-64" ]; then
libc6arch="libc6" libc6arch="libc6"
fi fi
cd "usr" if [ -e "$APPDIR/usr/optional/libstdc++/libstdc++.so.6" ]; then
if [ -e "./optional/libstdc++/libstdc++.so.6" ]; then
lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "libstdc++\.so\.6 ($libc6arch)" | awk 'NR==1{print $NF}')" lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "libstdc++\.so\.6 ($libc6arch)" | awk 'NR==1{print $NF}')"
sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GLIBCXX_3\.4' | sort -V | tail -n1) sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GLIBCXX_3\.4' | sort -V | tail -n1)
sym_app=$(tr '\0' '\n' < "./optional/libstdc++/libstdc++.so.6" | grep -e '^GLIBCXX_3\.4' | sort -V | tail -n1) sym_app=$(tr '\0' '\n' < "$APPDIR/usr/optional/libstdc++/libstdc++.so.6" | grep -e '^GLIBCXX_3\.4' | sort -V | tail -n1)
if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then
cxxpath="./optional/libstdc++:" cxxpath="$APPDIR/usr/optional/libstdc++:"
fi fi
fi fi
if [ -e "./optional/libgcc/libgcc_s.so.1" ]; then if [ -e "$APPDIR/usr/optional/libgcc/libgcc_s.so.1" ]; then
lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "libgcc_s\.so\.1 ($libc6arch)" | awk 'NR==1{print $NF}')" lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "libgcc_s\.so\.1 ($libc6arch)" | awk 'NR==1{print $NF}')"
sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GCC_[0-9]\\.[0-9]' | sort -V | tail -n1) sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GCC_[0-9]\\.[0-9]' | sort -V | tail -n1)
sym_app=$(tr '\0' '\n' < "./optional/libgcc/libgcc_s.so.1" | grep -e '^GCC_[0-9]\\.[0-9]' | sort -V | tail -n1) sym_app=$(tr '\0' '\n' < "$APPDIR/usr/optional/libgcc/libgcc_s.so.1" | grep -e '^GCC_[0-9]\\.[0-9]' | sort -V | tail -n1)
if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then
gccpath="./optional/libgcc:" gccpath="$APPDIR/usr/optional/libgcc:"
fi fi
fi fi
if [ -n "$cxxpath" ] || [ -n "$gccpath" ]; then if [ -n "$cxxpath" ] || [ -n "$gccpath" ]; then
if [ -e "./optional/exec.so" ]; then if [ -e "$APPDIR/usr/optional/exec.so" ]; then
execpre="" execpre=""
export LD_PRELOAD="./optional/exec.so:${LD_PRELOAD}" export LD_PRELOAD="$APPDIR/usr/optional/exec.so:${LD_PRELOAD}"
fi fi
export LD_LIBRARY_PATH="${cxxpath}${gccpath}${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${cxxpath}${gccpath}${LD_LIBRARY_PATH}"
fi fi