From patchwork Fri Nov 8 14:10:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Boilleau X-Patchwork-Id: 70146 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 8AFF327BBE9; Fri, 8 Nov 2024 18:46:38 +0000 (GMT) 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,FREEMAIL_FROM,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 DA14627BBEA for ; Fri, 8 Nov 2024 18:46:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9Tzh-0003F5-H6; Fri, 08 Nov 2024 13:46:05 -0500 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 1t9Tzf-0003EO-IY for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:03 -0500 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 1t9Tzf-0007jV-9G for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=h3ZyX81ZgsMMHdfeZgBLEau2mmLqN0sTzAhLPqmu/9w=; b=nB/dIZ7OE/H6rfPcCM2w3i66j90WuaTsoXd8+oYKxxdqMJejvv3bqHrRYgGK9K5twhlPxT3gWEWUmp0HXlKQiNgQCYJJ8vSZ8qcg7mQg1+YLXW6zLRi+/b/6/yqw8FSXe+cP/77XgEaCrBoC+ojk+xmkrsN4Z3VsVURl9mzmPFeJkVx8S/qECjplkl/byJunHPLXPgHTEZX51lNrSRIN7tkWLXZSLJS/g4vzZQoYVOJPsWZUaMCRNRVW7pWXNnM3u08HhJSPa7uXhjKxaJqdhaWeCLDX55ZewpANQLhc56WySx+YSo672lmKafjko/dEr+GRWwvDwI9Qtxx7NriQPA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t9Tzf-0004X0-3j for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74258] [PATCH 2/3] guix-install.sh: Replace `ROOT_HOME` with `~root` Resent-From: David Boilleau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Nov 2024 18:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74258@debbugs.gnu.org Cc: David Boilleau Received: via spool by 74258-submit@debbugs.gnu.org id=B74258.173109150216933 (code B ref 74258); Fri, 08 Nov 2024 18:46:03 +0000 Received: (at 74258) by debbugs.gnu.org; 8 Nov 2024 18:45:02 +0000 Received: from localhost ([127.0.0.1]:52131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Tyf-0004Oh-Um for submit@debbugs.gnu.org; Fri, 08 Nov 2024 13:45:02 -0500 Received: from mout.gmx.net ([212.227.17.21]:36255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9PhS-0000AL-HD for 74258@debbugs.gnu.org; Fri, 08 Nov 2024 09:10:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.fr; s=s31663417; t=1731075052; x=1731679852; i=david_boilleau@gmx.fr; bh=h3ZyX81ZgsMMHdfeZgBLEau2mmLqN0sTzAhLPqmu/9w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=uBtyvAj7pHZ1LZjQEZ/z8rvxXzB26v944uSPWZuEmuLk2cRQ6eJ39jGgvy1WuVOQ FH7thHHi12q4XQBtnUA3kh3EHChOHQ1yKwuJDD/AjkSHOqjbze224k7pAziMu7B4A s47YyjTiYVy4wASlirF+MYNZYHOxvLdjlEj8aEOjMEJjb4HAiEkVF41qsNwA5NyF7 VHEeubFfEVhzCMX0YaWliOyQFxLqE2eYuSYM+cDvk6byrS7t5KYgb5Lwv5Xn9RYAv vutV4GHyI7fsqwXrhBgQOUqN/n2NBg8yvIe1+W6AVx9sPf1CWqe9lpv2marIkmd/n PLcJlMMcyjWjnZmjqA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from pms ([88.126.7.20]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MTzb8-1tHlOr0ZaU-00TXft; Fri, 08 Nov 2024 15:10:52 +0100 Date: Fri, 8 Nov 2024 15:10:23 +0100 Message-ID: <1a9aa88fcacc1c9b2f173a0aa8a6aa7327a3a2b7.1731055803.git.david_boilleau@gmx.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:gckVTgaalK6xsLZRIEQBuvEohOvs22nlKg3n27GD8BTgX0lzTxY 5RKRWKWpF8amkTixBt4m3sX7J8a+GB/gWDmOKV7Fq7ZRdB7dCFCIyn1lH41I2KgOM4fquVn XNtmo6XV+G0KKBH1+A470xlFeTs3forQSx85IzyPolsdl6z8Hb/cQ7X+IIBdLeRJ0NBJQZ8 r5hz/+AJ6fPtzONz0U/EA== UI-OutboundReport: notjunk:1;M01:P0:/D2Slg94AQk=;jvwIS2aP4FYr5LKEsnUmu0O8i3y a9gH1OFngcSZBqIwBCqvRsJPVkINNq/NSCvf9jISxVviG/0JbBlcZIqhwJgHtKFo9zP26cyeV 4P3UMWfLXmgWVQ4GqksXCso/At7qbFmCihJiP2rsBs6CKSBndRmOINX2FxecTFzEbnTGl1Ouz RGftMDjr0wJ7aRmVbI3wZ8MOMVNCSg5AQ30x4tlZ8pcMwTsunQs01G8eiF8WMlDtEf3vdO+Ax NKa9yO63YxyUQh6WqfyUJIRvA0EK50kY5KzwskhhoBDSbunV+HtkJafkcFsNnTLqIoktgW+IV qGu7n/jpCcygEJNSc3qx23C3N83cb4+Pd7Ecb9TAuCaGqgm7I1NUTIBUmGF0noVID8/tqSl+P PBPDh2Nqyhl7WrVZuJsys73TL+n5B6vWYHdsun5MeM4a3b7tCuKfLdNuospEVyop3VCMZmsOu jMtJsmra7WajdVXsfeODCtZuVeVkR3Lhc4cfrgNMLSNmgnETZ8ZcYazLsRTe+zt5bKFXeRpK7 ydrVwfMZuftekXbc6xT97iDSFEgYb7Gn3o8CUpDUNFURC6NCK0JDNI3GuatI29N7Ss6BZoRE3 Iuy2yccm0g8FcLvbf742FMMbUEMfUh8YtWPzJzweXBFBsl6j/E/gUQuMRakibKNeOK8iq+Uov YFpRYES2zvZdAlT0H6OAph7r7PVSBhtW34fgTjoyRc9KP7k7kobaiBxH02zRsXZT95Xrkk0Bo OBV46wLFJYVfTM9vkG9lpPFkoLsPtXPIxvIIUdFXNwkqd4TtUIWqFSILzwp45TQY5DFLR1eM6 1tmOxOkIwHmVh5KtMtmFax69cF+JpLpW4XiPpJxYg03C3vQVVJ03fOmPHl1VKpBB1plGoZPrZ BFieeT7t0EGELn38ofaONNDHp7UBUSLKsN44yB+FWiai0bbB8FmE/Vug2 X-Mailman-Approved-At: Fri, 08 Nov 2024 13:44:56 -0500 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: David Boilleau X-ACL-Warn: , David Boilleau via Guix-patches X-Patchwork-Original-From: David Boilleau via Guix-patches via From: David Boilleau 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 The `ROOT_HOME` variable is natively absent from some systems, however the form `~root`, which is used by the install functions in this same file, works. * etc/guix-install.sh (sys_delete_store, sys_delete_guix_daemon) (sys_delete_user_profiles): Replace `ROOT_HOME` with `~root`. Change-Id: Ia867e271ac4c5557d9708235fee028bccce68342 --- etc/guix-install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.43.0 diff --git a/etc/guix-install.sh b/etc/guix-install.sh index e97190d964..7fb5ac63c5 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -410,8 +410,8 @@ sys_delete_store() _msg "${INF}removing /gnu" rm -rf /gnu - _msg "${INF}removing ${ROOT_HOME}/.config/guix" - rm -rf ${ROOT_HOME}/.config/guix + _msg "${INF}removing ~root/.config/guix" + rm -rf ~root/.config/guix } sys_create_build_user() @@ -594,7 +594,7 @@ sys_delete_guix_daemon() ;; NA|*) _msg "${ERR}unsupported init system; disable, stop and remove the daemon manually:" - echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" + echo " ~root/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" ;; esac @@ -743,9 +743,9 @@ sys_delete_init_profile() sys_delete_user_profiles() { - _msg "${INF}removing ${ROOT_HOME}/.guix-profile" - rm -f ${ROOT_HOME}/.guix-profile - rm -rf ${ROOT_HOME}/.cache/guix + _msg "${INF}removing ~root/.guix-profile" + rm -f ~root/.guix-profile + rm -rf ~root/.cache/guix _msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users" for user in `ls -1 /home`; do