Set APPDIR in AppRun if not set by AppImage

Hopefully this makes AppRun easier to user when the AppImage is extracted.
osdldbt · Mar 12, 2024 · c3ad7a4 · c3ad7a4
1 parent 7564d9c
commit c3ad7a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/appimage/AppRun.in b/appimage/AppRun.in
@@ -25,6 +25,10 @@ $(find "${APPDIR}/usr/bin" -maxdepth 1 -type f -name "dbt2-*" -printf "%f\n" | s
 EOF
 }
 
+if [ "${APPDIR}" = "" ]; then
+    APPDIR="$(cd -- "$(dirname -- "${0}")" && pwd)"
+fi
+
 if [ $# -eq 0 ]; then
 	usage
 	exit 1

diff --git a/doc/user-guide.rst b/doc/user-guide.rst
@@ -88,12 +88,9 @@ it hasn't already been done.  Examples in the documentation will assume it has
 been renamed to `dbt2`.
 
 If FUSE is not available, the AppImage is self-extracting and provides a script
-`AppRun` that can be executed as if running the AppImage itself, when the
-**APPDIR** environment variable is set to the absolute path of the extracted
-`squashfs-root` directory.::
+`AppRun` that can be executed as if running the AppImage itself::
 
     dbt2-*.AppImage --extract-appimage
-    export APPDIR="$(pwd)/squashfs-root"
     squashfs-root/AppRun
 
 Alternatively, one could also set `PATH` and `LD_LIBRARTY_PATH` manually to
-Original file line number
+Diff line change
@@ Expand Up @@
     EOF
     }
+    if [ "${APPDIR}" = "" ]; then
+        APPDIR="$(cd -- "$(dirname -- "${0}")" && pwd)"
+    fi
     if [ $# -eq 0 ]; then
     	usage
     	exit 1
@@ Expand Down @@