diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-12-30 17:57:08 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-12-31 13:08:29 +0100 |
| commit | 561ff616747859e089f34763552afe5b52002829 (patch) | |
| tree | 76a448201292f394c12620a4604a54bf9ab8eceb | |
| parent | update Changelog and add a note to the Readme (diff) | |
| download | librewolf-linux-561ff616747859e089f34763552afe5b52002829.tar.gz librewolf-linux-561ff616747859e089f34763552afe5b52002829.tar.bz2 librewolf-linux-561ff616747859e089f34763552afe5b52002829.zip | |
Set default XDG_DATA_DIRS in AppRun if unset
This fixes #139 by providing default values for `XDG_DATA_DIRS` when
`XDG_DATA_DIRS` is not set on the host system the AppImage is run on.
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rwxr-xr-x | appimage/content/AppRun | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 625c7b2..012692c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project follows the official Firefox releases, but also uses [Arch Linux Package Versioning](https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_versioning) to mark individual releases in between versions. +## [84.0-2] - Unreleased + +### Fixed + +- Fixed AppImage crashes when `XDG_DATA_DIRS` is unset (fixes #139) + ## [84.0-1] - 2020-12-25 ### Changed diff --git a/appimage/content/AppRun b/appimage/content/AppRun index 12f1b5a..dd148fa 100755 --- a/appimage/content/AppRun +++ b/appimage/content/AppRun @@ -5,7 +5,8 @@ export PATH="${HERE}:${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HER export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}" export MOZ_LEGACY_PROFILES=1 # Prevent per installation profiles -export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" +DEFAULT_XDG_DATA_DIRS='./share/:/usr/share/gnome:/usr/local/share/:/usr/share/' +export XDG_DATA_DIRS="${HERE}/usr/share/:${XDG_DATA_DIRS:-$DEFAULT_XDG_DATA_DIRS}" export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}" export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}" export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}" |