Skip to content

Commit 31a1faa

Browse files
authored
add a terrible hack to unset problematic env variables (#14)
1 parent b654c0a commit 31a1faa

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

hack.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/source/rofi.c b/source/rofi.c
2+
index 37ad16f0..58fca78a 100644
3+
--- a/source/rofi.c
4+
+++ b/source/rofi.c
5+
@@ -76,6 +76,19 @@
6+
7+
#endif
8+
9+
+/** Terrible hack */
10+
+static void terrible_hack_for_appimage(void)
11+
+{
12+
+ if ( g_getenv("APPDIR") ) {
13+
+ g_unsetenv("APPDIR");
14+
+ g_unsetenv("GIO_MODULE_DIR");
15+
+ g_unsetenv("GSETTINGS_SCHEMA_DIR");
16+
+ g_unsetenv("GDK_PIXBUF_MODULEDIR");
17+
+ g_unsetenv("GDK_PIXBUF_MODULE_FILE");
18+
+ g_unsetenv("GTK_PATH");
19+
+ }
20+
+}
21+
+
22+
/** Location of pidfile for this instance. */
23+
char *pidfile = NULL;
24+
/** Location of Cache directory. */
25+
@@ -1299,6 +1312,8 @@ int main(int argc, char *argv[]) {
26+
rofi_icon_fetcher_init();
27+
TICK_N("Icon fetcher initialize");
28+
29+
+ terrible_hack_for_appimage();
30+
+
31+
gboolean kill_running = FALSE;
32+
if (find_arg("-replace") >= 0) {
33+
kill_running = TRUE;

rofi-appimage.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ export URUNTIME_PRELOAD=1
99
UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|latest|*$ARCH.AppImage.zsync"
1010
SHARUN="https://github.com/VHSgunzo/sharun/releases/latest/download/sharun-$ARCH-aio"
1111
APPIMAGETOOL="https://github.com/pkgforge-dev/appimagetool-uruntime/releases/download/continuous/appimagetool-$ARCH.AppImage"
12+
PATCH="$PWD"/hack.patch
1213

1314
# CREATE DIRECTORIES
1415
mkdir ./AppDir && (
1516
cd ./AppDir
1617
# DOWNLOAD AND BUILD ROFI
1718
git clone --depth 1 "https://github.com/davatorium/rofi.git" ./rofi && (
1819
cd ./rofi
20+
cp -v "$PATCH" ./hack.patch
21+
patch -p1 -i ./hack.patch
1922
meson --prefix /usr . build
2023
meson compile -C build
2124
meson install -C build --destdir "$(realpath ../)"

0 commit comments

Comments
 (0)