Avoid changing the PWD unless strictly needed, to avoid messing with local parameter an AppImage may receive

master
Ismael Barros² 2015-03-09 23:20:26 +01:00
parent 930ee0dfbc
commit a4b47163cf
5 changed files with 8 additions and 18 deletions

View File

@ -15,10 +15,8 @@ BINARY_ARGS="-jar _BINARY_"
#eval arguments="$(patch_relative_paths "$@")"
#set -- "${arguments[@]}"
cd "$APPDIR"
export PATH="$PWD/jre1.7.0_17/bin:${PATH}"
export LD_LIBRARY_PATH="$PWD/jre1.7.0_17/lib/i386:${LD_LIBRARY_PATH}"
export PATH="$APPDIR/jre1.7.0_17/bin:${PATH}"
export LD_LIBRARY_PATH="$APPDIR/jre1.7.0_17/lib/i386:${LD_LIBRARY_PATH}"
[ -z "$*" ] && show_usage "usage.txt"

View File

@ -15,16 +15,14 @@ BINARY_ARGS=
#eval arguments="$(patch_relative_paths "$@")"
#set -- "${arguments[@]}"
cd "$APPDIR"
export PATH="$PWD/usr/bin/:$PATH"
export PATH="$APPDIR/usr/bin/:$PATH"
[ -z "$*" ] && show_usage "usage.txt"
setup_keepResolution
ret=0
cd usr/
cd "$APPDIR/usr/"
{
export RUNELF_HELPERS="$APPDIR/usr/lib/ld-linux.so.2"
run_withLocalLibs $APPRUN_HELPERS $RUNELF_HELPERS "$BINARY" $BINARY_ARGS "$@"

View File

@ -6,7 +6,7 @@ export APPDIR="$(dirname "$(readlink -f "$0")")"
export APPPKG="$(basename "$APPIMAGE")"
LOGFILE=$(mktemp "/tmp/AppRun-log-${APPPKG}.XXXXXXXXXX")
BINARY="./_BINARY_"
BINARY="$APPDIR/_BINARY_"
BINARY_ARGS=
. "$APPDIR/util.sh"
@ -15,9 +15,7 @@ BINARY_ARGS=
#eval arguments="$(patch_relative_paths "$@")"
#set -- "${arguments[@]}"
cd "$APPDIR"
export PATH="$PWD/usr/bin/:$PATH"
export PATH="$APPDIR/usr/bin/:$PATH"
[ -z "$*" ] && show_usage "usage.txt"

View File

@ -15,9 +15,7 @@ BINARY_ARGS=
#eval arguments="$(patch_relative_paths "$@")"
#set -- "${arguments[@]}"
cd "$APPDIR"
export PATH="$PWD/usr/bin/:$PATH"
export PATH="$APPDIR/usr/bin/:$PATH"
[ -z "$*" ] && show_usage "usage.txt"

View File

@ -16,9 +16,7 @@ WINETRICKS=
#eval arguments="$(patch_relative_paths "$@")"
#set -- "${arguments[@]}"
cd "$APPDIR"
export PATH="$PWD/usr/bin/:${PATH}"
export PATH="$APPDIR/usr/bin/:${PATH}"
[ -z "$*" ] && show_usage "usage.txt"