From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ILv8DschfWGHogAAgWs5BA (envelope-from ) for ; Sat, 30 Oct 2021 12:43:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sD6TCschfWHMRgAAbx9fmQ (envelope-from ) for ; Sat, 30 Oct 2021 10:43:19 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E97B03E569 for ; Sat, 30 Oct 2021 12:43:18 +0200 (CEST) Received: from localhost ([::1]:51992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mglpW-0001IO-2K for larch@yhetil.org; Sat, 30 Oct 2021 06:43:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mglpG-0000tz-Mu for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mglpG-0001sD-Dt for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mglpG-0002bB-C8 for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50873] [PATCH v3 1/8] guix home: import: Make the user to specify a destination directory. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Oct 2021 10:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50873@debbugs.gnu.org, Oleg Pykhalov , Andrew Tropin , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 50873-submit@debbugs.gnu.org id=B50873.16355905649905 (code B ref 50873); Sat, 30 Oct 2021 10:43:02 +0000 Received: (at 50873) by debbugs.gnu.org; 30 Oct 2021 10:42:44 +0000 Received: from localhost ([127.0.0.1]:56716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglox-0002Zg-JY for submit@debbugs.gnu.org; Sat, 30 Oct 2021 06:42:44 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59260 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglon-0002YY-Qh for 50873@debbugs.gnu.org; Sat, 30 Oct 2021 06:42:34 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635590548; bh=DbXLvNf2Gp330sdB/TY7J5Tet0J5OWXLZky0C2PXlt4=; h=From:To:Subject:In-Reply-To:References:Date; b=MHeTSnstulwiep8iR6oNwalnmuX6GB3hO25hA1allKP4+ckH8yMTIJ1jTFvDB1elC CSTGtbFh0tfSBPm4V7Zz37pgxaF4nz739Nedp/6hS7bxz6+3Lh6wtEy9WjPBHhm39E Hn5twp5DmgqrWttoDNVJh7pKeXhoLkYI++AUYlxs= In-Reply-To: References: Message-Id: <4b3eb05f3fb1bfbd3e7f16c3ba5862a603372df0.1635590221.git.public@yoctocell.xyz> Date: Sat, 30 Oct 2021 12:42:27 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635590599; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=yyobtLui4DSglvA726kS/FTWac0y71fztDIeCvolQIw=; b=ghW8lw1f20Ikhs7azGPdNuEJAvoGDmnxMNKYNtM6AwUeyqIUmOsypMmR3+r/n6qsMskfQM xnEVxnxxD6DsKpAyl5wW23H5HC3exAFUWyD4h5Se9DmSSO4JUxZZskL+qzwzNwAUAG9bL5 4gPBmMODLQF86JahQ1Fi36/9PNgEQ+6P55SnVUYHYOzQtGMWReIIr1DPAluPu+2JP6Mx21 9TUI+PIur3S+LJIfxDQ4CK70cBB4d2rUFq54igLZb3EGg/PkdMWNrqAlWcEt9pQlB9LRq9 V020eE4wqjkxduUBKyqgmu5NzNStKjo+aB5Qmlwdqgs21nNbracBA8NuuN691g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635590599; a=rsa-sha256; cv=none; b=XcWhfQj0oeanLnco3zA3XUnc1zcWmvMhYXPX42S3YZXMIuoc5L9qSVfY1eOUwkQQYoHZO5 eTLO7VINawCZlY6Brj8T3Iu+ZCYBH+JvmgihuwvmVOgBVan1BsmMsJ0rnjL1sdTTP67Kwr adkTD2a2hkUKUiK8yADkK6hlF8h8/AO9hBuiV9flRPo62Qsh+8A3IISkJ8+ZyMxwWh7YlB mMSnFGFNwuTir5k5BqMlQ+M57kjVd4fOfZ66HioQUWkd3brswPyZaVrSjmVZ1kFazqra8H 6f5ROdH7qhnbUNC0mKvWeFRTpFJZa4EQkLt2eJ2DhZYgo1xMiNAB0KxgZO5XeQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=MHeTSnst; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.18 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=MHeTSnst; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E97B03E569 X-Spam-Score: 1.18 X-Migadu-Scanner: scn0.migadu.com X-TUID: OBtoTHqUsbnK Copy the appropriate the relevant configuration files to the destination directory, and call =E2=80=98local-file=E2=80=99 on them. Without this, =E2=80=98guix home import=E2=80=99 will generate a service de= claration like this (service home-bash-service-type (home-bash-configuration (bashrc (list (slurp-file-gexp (local-file "/home/yoctocell/.bashrc")))))) but when running =E2=80=98guix home reconfigure=E2=80=99, the ~/.bashrc fil= e would be moved, so when running =E2=80=98guix home reconfigure=E2=80=99 for the second time, i= t would read the ~/.bashrc which is itself a symlink to a file the store. * guix/scripts/home/import.scm (generate-bash-module+configuration): Take =E2=80=98destination-directory=E2=80=99 parameter (modules+configurations): Copy the user=E2=80=99s configuration file to =E2=80=98%destination-directory=E2=80=99. * guix/scripts/home.scm (process-command): Adjust accordingly; create =E2=80=98destination=E2=80=99 if it doesn=E2=80=99t exist. --- guix/scripts/home.scm | 24 ++++++---- guix/scripts/home/import.scm | 86 +++++++++++++++++++++--------------- 2 files changed, 65 insertions(+), 45 deletions(-) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 55e7b436c1..3f48b98ed4 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -40,6 +40,7 @@ (define-module (guix scripts home) #:autoload (guix scripts pull) (channel-commit-hyperlink) #:use-module (guix scripts home import) #:use-module ((guix status) #:select (with-status-verbosity)) + #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (srfi srfi-1) @@ -260,15 +261,20 @@ (define-syntax-rule (with-store* store exp ...) (apply search args)) ((import) (let* ((profiles (delete-duplicates - (match (filter-map (match-lambda - (('profile . p) p) - (_ #f)) - opts) - (() (list %current-profile)) - (lst (reverse lst))))) - (manifest (concatenate-manifests - (map profile-manifest profiles)))) - (import-manifest manifest (current-output-port)))) + (match (filter-map (match-lambda + (('profile . p) p) + (_ #f)) + opts) + (() (list %current-profile)) + (lst (reverse lst))))) + (manifest (concatenate-manifests + (map profile-manifest profiles))) + (destination (match args + ((destination) destination) + (_ (leave (G_ "wrong number of arguments~%"))))= )) + (unless (file-exists? destination) + (mkdir-p destination)) + (import-manifest manifest destination (current-output-port)))) ((describe) (match (generation-number %guix-home) (0 diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm index 611f580e85..c7c60e95e8 100644 --- a/guix/scripts/home/import.scm +++ b/guix/scripts/home/import.scm @@ -36,49 +36,61 @@ (define-module (guix scripts home import) ;;; ;;; Code: =20 +(define (generate-bash-configuration+modules destination-directory) + (define (destination-append path) + (string-append destination-directory "/" path)) =20 -(define (generate-bash-module+configuration) - (let ((rc (string-append (getenv "HOME") "/.bashrc")) - (profile (string-append (getenv "HOME") "/.bash_profile")) - (logout (string-append (getenv "HOME") "/.bash_logout"))) - `((gnu home services bash) + (let ((rc (destination-append ".bashrc")) + (profile (destination-append ".bash_profile")) + (logout (destination-append ".bash_logout"))) + `((gnu home-services bash) (service home-bash-service-type - (home-bash-configuration - ,@(if (file-exists? rc) - `((bashrc - (list (local-file ,rc)))) - '()) - ,@(if (file-exists? profile) - `((bash-profile - (list (local-file ,profile)))) - '()) - ,@(if (file-exists? logout) - `((bash-logout - (list (local-file ,logout)))) - '())))))) - + (home-bash-configuration + ,@(if (file-exists? rc) + `((bashrc + (list (slurp-file-gexp + (local-file ,rc))))) + '()) + ,@(if (file-exists? profile) + `((bash-profile + (list (slurp-file-gexp + (local-file ,profile))))) + '()) + ,@(if (file-exists? logout) + `((bash-logout + (list (slurp-file-gexp + (local-file ,logout))))) + '())))))) =20 (define %files-configurations-alist `((".bashrc" . ,generate-bash-module+configuration) (".bash_profile" . ,generate-bash-module+configuration) (".bash_logout" . ,generate-bash-module+configuration))) =20 -(define (modules+configurations) - (let ((configurations (delete-duplicates - (filter-map (match-lambda - ((file . proc) - (if (file-exists? - (string-append (getenv "HOME") "/" f= ile)) - proc - #f))) - %files-configurations-alist) - (lambda (x y) - (equal? (procedure-name x) (procedure-name y)))= ))) - (map (lambda (proc) (proc)) configurations))) +(define (configurations+modules destination-directory) + "Return a list of procedures which when called, generate code for a home +service declaration." + (define configurations + (delete-duplicates + (filter-map (match-lambda + ((file . proc) + (let ((absolute-path (string-append (getenv "HOME") + "/" file))) + (and (file-exists? absolute-path) + (begin + (copy-file absolute-path + (string-append + destination-directory "/" file)) + proc))))) + %files+configurations-alist) + (lambda (x y) + (equal? (procedure-name x) (procedure-name y))))) +=20=20 + (map (lambda (proc) (proc destination-directory)) configurations)) =20 ;; Based on `manifest->code' from (guix profiles) ;; MAYBE: Upstream it? -(define* (manifest->code manifest +(define* (manifest->code manifest destination-directory #:key (entry-package-version (const "")) (home-environment? #f)) @@ -129,7 +141,8 @@ (define (qualified-name entry) ":" output)))) (manifest-entries manifest)))) (if home-environment? - (let ((modules+configurations (modules+configurations))) + (let ((configurations+modules + (configurations+modules destination-directory))) `(begin (use-modules (gnu home) (gnu packages) @@ -171,7 +184,8 @@ (define name (options->transformation ',options)))) transformation-procedures))) (if home-environment? - (let ((modules+configurations (modules+configurations))) + (let ((configurations+modules + (configurations+modules destination-directory))) `(begin (use-modules (guix transformations) (gnu home) @@ -204,7 +218,7 @@ (define* (home-environment-template #:key (packages #f)= (specs #f) services) (services (list ,@services)))) =20 (define* (import-manifest - manifest + manifest destination-directory #:optional (port (current-output-port))) "Write to PORT a corresponding to MANIFEST." (define (version-spec entry) @@ -227,7 +241,7 @@ (define (version-spec entry) (version-unique-prefix (manifest-entry-version entry) versions))))))) =20 - (match (manifest->code manifest + (match (manifest->code manifest destination-directory #:entry-package-version version-spec #:home-environment? #t) (('begin exp ...) --=20 2.33.0