From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 18:40:12 2020 Received: (at submit) by debbugs.gnu.org; 21 Jan 2020 23:40:12 +0000 Received: from localhost ([127.0.0.1]:48678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu37y-00066N-39 for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:40:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:59906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu2Vq-0005Ai-SO for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:00:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu2Vk-0004GM-FZ for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:46 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iu2Ve-0001rx-9z for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:38 -0500 Received: from mail.iitp.ru ([188.93.104.8]:49150 helo=iitp.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iu2VZ-0001hT-Ma for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=iitp.ru; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=/ylfljySzbMWF0YIY/gOiR7aJX8=; b=bkVkWgk0cmfuiXHXfaVr jieaf/ZCSwb11F6eWWxl+x12EIpHf9vkYJ5GQpaD7YmiFiuMnhNcd1Yi6+VcDPCH fH/UIz8mpQfKOOgCqU5jHtElY2EIJVgUdQZjmIIMAd/q3wDSOCghi+DyFb4pIxmB iI+7zlNNNSNSSxhxWjTvUzU= Received: from [185.245.84.124] (account krotov@iitp.ru HELO localhost) by iitp.ru (CommuniGate Pro SMTP 6.0.11) with ESMTPSA id 35344000; Wed, 22 Jan 2020 02:00:30 +0300 From: Alexander Krotov To: guix-patches@gnu.org Subject: [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS Date: Wed, 22 Jan 2020 02:01:33 +0300 Message-Id: <20200121230133.12958-1-krotov@iitp.ru> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 188.93.104.8 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 21 Jan 2020 18:40:09 -0500 Cc: Alexander Krotov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share" is used according to XDG Base Directory Specification. However, /etc/profile.d/guix.sh treats this value as empty list when appending its own directory, so after installing Guix on the system, launchers such as Rofi stop searching for .desktop files in /usr/share/applications/ and can't launch applications other than those installed with Guix. This patch fixes the bug in generated /etc/profile.d/guix.sh * etc/guix-install.sh (sys_create_init_profile): Use default value of /usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not set. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b57d71981f..da781d41ff 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -409,7 +409,7 @@ export GUIX_PROFILE GUIX_LOCPATH eval `guix package --search-paths=prefix 2> /dev/null` # set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" EOF } -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 26 17:21:05 2020 Received: (at 39231-done) by debbugs.gnu.org; 26 Jan 2020 22:21:05 +0000 Received: from localhost ([127.0.0.1]:57618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivqHB-0008Oo-4J for submit@debbugs.gnu.org; Sun, 26 Jan 2020 17:21:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivqH9-0008NY-70 for 39231-done@debbugs.gnu.org; Sun, 26 Jan 2020 17:21:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ivqH3-0007r1-Je; Sun, 26 Jan 2020 17:20:57 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33910 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ivqH3-0005GN-3e; Sun, 26 Jan 2020 17:20:57 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Alexander Krotov Subject: Re: [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS References: <20200121230133.12958-1-krotov@iitp.ru> Date: Sun, 26 Jan 2020 23:20:55 +0100 In-Reply-To: <20200121230133.12958-1-krotov@iitp.ru> (Alexander Krotov's message of "Wed, 22 Jan 2020 02:01:33 +0300") Message-ID: <87pnf56erc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39231-done Cc: 39231-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Alexander Krotov skribis: > If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share" > is used according to XDG Base Directory Specification. However, > /etc/profile.d/guix.sh treats this value as empty list when appending its > own directory, so after installing Guix on the system, launchers such > as Rofi stop searching for .desktop files in /usr/share/applications/ > and can't launch applications other than those installed with Guix. > > This patch fixes the bug in generated /etc/profile.d/guix.sh > > * etc/guix-install.sh (sys_create_init_profile): Use default value of > /usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not > set. Good catch. Applied, thanks! Ludo=E2=80=99. From unknown Sat Jun 21 10:43:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 24 Feb 2020 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator