From patchwork Tue May 27 13:28:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 42936 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D31727BC4B; Tue, 27 May 2025 14:29:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B624227BC4A for ; Tue, 27 May 2025 14:29:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJuMa-0007RC-Jt; Tue, 27 May 2025 09:29:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJuMZ-0007Qv-9K for guix-patches@gnu.org; Tue, 27 May 2025 09:29:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJuMY-0001FW-Vr for guix-patches@gnu.org; Tue, 27 May 2025 09:29:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=6BxkAYMAv1b48nf15s1nZsnfuMNtpNzOpJV4miaZdWI=; b=b9Wzg0r5aTiLcEaML9FCweg3teSnyPJxyaofie+IQa3LMHJKVhDkzZlKSsKbZl4rA8FRfIOdb5sLwofOxZIq9hHIErTSnoT1bctSl0cpoMmWHCXtsn5eNfSiNc1TZYV9QN2gzx+TRrfvWcBBgiCCy/axAQ9WSyeM6pWuKiBnRViYOOKDpTMihGIqBZD8u0VS6xViPN9+6ppSh/cq8J6R9bZWo/AZbFEeQ04eWCahwpOLKWzYYuqly+RGIKBlJUO/KehOasJhIISm7E3dzArXLrHPJBgPNYP3WETGxBLGTIgkhzRGq4Ml1OBHSh7u4LjwyW3Dnq/Yso555Ugrgy1e/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uJuMY-0007S9-P5 for guix-patches@gnu.org; Tue, 27 May 2025 09:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78603] [PATCH v2] services: readymedia: Use relative paths to cache and log directories for home. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 May 2025 13:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78603 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78603@debbugs.gnu.org Cc: Sughosha Received: via spool by 78603-submit@debbugs.gnu.org id=B78603.174835252628589 (code B ref 78603); Tue, 27 May 2025 13:29:02 +0000 Received: (at 78603) by debbugs.gnu.org; 27 May 2025 13:28:46 +0000 Received: from localhost ([127.0.0.1]:40224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJuMH-0007R1-SW for submit@debbugs.gnu.org; Tue, 27 May 2025 09:28:46 -0400 Received: from layka.disroot.org ([178.21.23.139]:58774) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uJuMF-0007QK-B8 for 78603@debbugs.gnu.org; Tue, 27 May 2025 09:28:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 07D3525F07; Tue, 27 May 2025 15:28:42 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id EuutzZUv2VKD; Tue, 27 May 2025 15:28:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1748352521; bh=4fRisxidVIgzA6rCqPNyDMD9BfNpvzlzYUun0fkWkjU=; h=From:To:Cc:Subject:Date; b=lMh6pNwDj6nK485ukz+/56qp3aDyah8IMaorz1oxC0deXQBzqbwF0gtgFJrTkciaF TB/7mKbKIpt/pf7WNoOb4YNtHu4Xwc8XL6nv3rwrEfIf4ajTfgInxtEUmFFYw+tXlB dHYx2p4pMDrbMdlANSvW4McGYa6eNIQY1hr3nXB1vfU3D9GS79oSHnat2pQ0C5Pve0 JVptOcVXd4RxTevKZ169tcrbbuv0cQEUYq9Hw11pzm8sDVE1rndG0P1/tbIGHwEH3v ouKVX59PYwxa0qilTIEEtaQF1OjvlOVonIbUBstWdkpqZj6KQDVKF/DqKEnLhCQkPk HO1YLK7SuDymg== Date: Tue, 27 May 2025 18:58:15 +0530 Message-ID: <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes readymedia configured by a different user. * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Update path. [log-directory]: Ditto. Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be --- gnu/services/upnp.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) base-commit: c15f786f8936502249b639220997094fdbf7f1e8 diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm index 8267b1e53af..a5954c83f40 100644 --- a/gnu/services/upnp.scm +++ b/gnu/services/upnp.scm @@ -74,19 +74,12 @@ (define-record-type* (default #f)) (cache-directory readymedia-configuration-cache-directory (default (if for-home? - (string-append (or (getenv "XDG_CACHE_HOME") - (string-append - (getenv "HOME") "/.cache")) - "/readymedia") - %readymedia-default-cache-directory))) + ".cache/readymedia" + %readymedia-default-cache-directory))) (log-directory readymedia-configuration-log-directory (default (if for-home? - (string-append (or (getenv "XDG_STATE_HOME") - (string-append - (getenv "HOME") - "/.local/state")) - "/readymedia") - %readymedia-default-log-directory))) + ".local/state/readymedia" + %readymedia-default-log-directory))) (friendly-name readymedia-configuration-friendly-name (default #f)) (media-directories readymedia-configuration-media-directories)