From f6642257096c6fe0f78984d989790a3d9e1056fe Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 7 Nov 2017 07:52:52 +0100 Subject: Fix ~/.fehbg no longer being source-able (closes #342) --- ChangeLog | 6 ++++++ src/imlib.c | 2 +- src/wallpaper.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5b814a..752b29d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue, 07 Nov 2017 07:51:48 +0100 + +* Release v2.22.1 + * Allow ~/.fehbg to be sourced (instead of executed) from other shell + scripts again (broken in 2.22) + Sat, 04 Nov 2017 14:55:38 +0100 Daniel Friesel * Release v2.22 diff --git a/src/imlib.c b/src/imlib.c index 82a9865..abdef4e 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -467,7 +467,7 @@ static char *feh_http_load_image(char *url) char *feh_http_load_image(char *url) { weprintf( - "Cannot load image %s\n Please recompile with libcurl support", + "Cannot load image %s\nPlease recompile feh with libcurl support", url ); return NULL; diff --git a/src/wallpaper.c b/src/wallpaper.c index 2a4743f..c9a3a05 100644 --- a/src/wallpaper.c +++ b/src/wallpaper.c @@ -436,7 +436,7 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled, if ((fp = fopen(path, "w")) == NULL) { weprintf("Can't write to %s", path); } else { - fputs("#!/bin/sh\nexec ", fp); + fputs("#!/bin/sh\n", fp); if (use_filelist) { for (int i = 0; i < cmdargc; i++) { fputs(shell_escape(cmdargv[i]), fp); -- cgit v1.2.3