octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-31 22:11:53 +00:00
Code Issues Releases Wiki Activity

Fixes in appimage AppRun (fixes #789)

Browse Source 
* Don't "shift" when $ARGV0 is a qpdf executable
* Base -- to basename to avoid stuff like `qpdf --version` calling
  `basename --version`
This commit is contained in:
Jay Berkenbilt 2022-09-27 07:39:09 -04:00
parent f4ca04cec1
commit 7a74a491b1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
appimage/AppRun
View File

@ -381,7 +381,7 @@ fi
if [ x"$1" == "xman" -o x"$1" == "x--man" ] ; then if [ x"$1" == "xman" -o x"$1" == "x--man" ] ; then
export MANPATH="$HERE/usr/share/man:$MANPATH" export MANPATH="$HERE/usr/share/man:$MANPATH"
shift shift
exec man "$@" || man $(basename $1) exec man "$@" || man $(basename -- $1)
fi fi
@ -452,9 +452,9 @@ fi
### Main stuff happens from here: ### Main stuff happens from here:
if [ ! -z $APPIMAGE ] ; then if [ ! -z $APPIMAGE ] ; then
# We run as an AppImage # We run as an AppImage
BINARY_NAME=$(basename "$ARGV0") BINARY_NAME=$(basename -- "$ARGV0")
APPIMAGE=$APPIMAGE APPIMAGE=$APPIMAGE
CALLED_SUBCMD=$( basename $1 2>/dev/null ) CALLED_SUBCMD=$( basename -- $1 2>/dev/null )
if [ "x$SET_SHOW_ENV_FOR_APPRUN" == "xYeSS" ] ; then if [ "x$SET_SHOW_ENV_FOR_APPRUN" == "xYeSS" ] ; then
# We have the (hidden) env var for debugging stuff set # We have the (hidden) env var for debugging stuff set
echo BINARY_NAME=$BINARY_NAME 1>&2 # Don't leak strings into output of qpdf|fix-pdf|zlib-flate going to stdout! echo BINARY_NAME=$BINARY_NAME 1>&2 # Don't leak strings into output of qpdf|fix-pdf|zlib-flate going to stdout!
@ -470,7 +470,6 @@ if [ ! -z $APPIMAGE ] ; then
echo APPIMAGE=$APPIMAGE 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout! echo APPIMAGE=$APPIMAGE 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout!
echo CALLED_SUBCMD=$CALLED_SUBCMD 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout! echo CALLED_SUBCMD=$CALLED_SUBCMD 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout!
fi fi
shift
exec "$HERE/usr/bin/$BINARY_NAME" "$@" exec "$HERE/usr/bin/$BINARY_NAME" "$@"
else else
@ -504,9 +503,9 @@ if [ ! -z $APPIMAGE ] ; then
else else
# Most likely we run from an AppDir, not as an AppImage: # Most likely we run from an AppDir, not as an AppImage:
BINARY_NAME=$(basename "$ARGV0") BINARY_NAME=$(basename -- "$ARGV0")
APPIMAGE=$APPIMAGE APPIMAGE=$APPIMAGE
CALLED_SUBCMD=$( basename $1 2>/dev/null ) CALLED_SUBCMD=$( basename -- $1 2>/dev/null )
if [ "x$SET_SHOW_ENV_FOR_APPRUN" == "xYeSS" ] ; then if [ "x$SET_SHOW_ENV_FOR_APPRUN" == "xYeSS" ] ; then
# We have the (hidden) env var for debugging stuff set # We have the (hidden) env var for debugging stuff set
echo BINARY_NAME=$BINARY_NAME 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout! echo BINARY_NAME=$BINARY_NAME 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout!
@ -534,7 +533,6 @@ else
echo APPIMAGE=$APPIMAGE 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout! echo APPIMAGE=$APPIMAGE 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout!
echo CALLED_SUBCMD=$CALLED_SUBCMD 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout! echo CALLED_SUBCMD=$CALLED_SUBCMD 1>&2 # Don't leak strings into qpdf|fix-pdf|zlib-flate output going to stdout!
fi fi
shift
exec "$HERE/usr/bin/$BINARY_NAME" "$@" exec "$HERE/usr/bin/$BINARY_NAME" "$@"
else else