From patchwork Thu Aug 26 10:58:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 32302 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 862B927BBE4; Thu, 26 Aug 2021 11:59:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B48127BBE3 for ; Thu, 26 Aug 2021 11:59:09 +0100 (BST) Received: from localhost ([::1]:35094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJD6C-000278-7d for patchwork@mira.cbaines.net; Thu, 26 Aug 2021 06:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJD66-00026Z-3b for guix-patches@gnu.org; Thu, 26 Aug 2021 06:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJD65-0000lj-Rv for guix-patches@gnu.org; Thu, 26 Aug 2021 06:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJD65-0000oZ-RU for guix-patches@gnu.org; Thu, 26 Aug 2021 06:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50208] [PATCH] home-services: Add symlink-manager Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Aug 2021 10:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andrew Tropin Cc: 50208@debbugs.gnu.org Received: via spool by 50208-submit@debbugs.gnu.org id=B50208.16299755323115 (code B ref 50208); Thu, 26 Aug 2021 10:59:01 +0000 Received: (at 50208) by debbugs.gnu.org; 26 Aug 2021 10:58:52 +0000 Received: from localhost ([127.0.0.1]:48482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJD5v-0000oA-Kq for submit@debbugs.gnu.org; Thu, 26 Aug 2021 06:58:52 -0400 Received: from mail-lf1-f50.google.com ([209.85.167.50]:33583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJD5r-0000nt-IX for 50208@debbugs.gnu.org; Thu, 26 Aug 2021 06:58:50 -0400 Received: by mail-lf1-f50.google.com with SMTP id p38so6062488lfa.0 for <50208@debbugs.gnu.org>; Thu, 26 Aug 2021 03:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=nNPvqS6wAdcNIUfBSWSmXIyAVMzV2aQa3UBP686KD1w=; b=nFzW0k+iewNWYbdsYXLhP6+qV5BoW86n3UVg5Q2KAEmj6LuIOSL0bO8JTmbPNX2jpX yGg3FSLMFkgWw6zzBPV60eGupZRaX4KhSLHqkVyWu26M7vmfKcQhtzM66ZScZ9oU6kFm liqHNmT9Qyy7GVJ77wk2J5YP+PxjloDKe8KMIMGhntus7rhLHXfrA2doXuDGR56iaPI8 c6XN1bp0JSns4YMEcnpINrIsKvmjzsZO9AayRQhn7V4h4OYRqcZ1cJPC3fSq/bK823mf RbDREbgpcQJICaeWFJD92357sPY5VHcpJ/0+2cad53u/NOM8KeGRaACZ7p9TwUHxLXqp 9LwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=nNPvqS6wAdcNIUfBSWSmXIyAVMzV2aQa3UBP686KD1w=; b=MNKOPccLBkJwjpGuAUHDpVhzCy9gIvQWXgkXaz8EBKdNmkWlSjlI+2j7hFw4ClXCxV BYg01kI3pEqEKnTCnMBR7dDyxCRHAtHxHvcQgjvJfUtZwfP3yN0NxEBDG1y72TZntOTr 6IrCL/l8eSD2/SwPY4ErS0pTYfx23OKT7tHb2mtX9EQh0WDww7sfcicQxw0dxgsZaS++ Ipg6g6lqnW5L+/tXSiy145eJ4gmYytBhIc45N87yNOU04tcfCaPnJFAFXVtX67CmzTPI NYgMEiGm3mPkypiYKXHX/RKB57YOqqVZhguL3MAeXOnzOU0SqQ9MCdfjaBhEUUtKurtw sC+A== X-Gm-Message-State: AOAM532ggPTyJnrbPscfe/TfXVng8QVDJEisqJ0zAekLnna51491d1a+ uUBlFOyjKipd+x+56KXs4T3OkcRder4= X-Google-Smtp-Source: ABdhPJzJo3/YeTZq4Sh8PLEO0v6qgJe6QwTCaD6hUxNvY+pA7LNxQ2AmRARIE01J+oG+R6Izpm6h1w== X-Received: by 2002:ac2:44dc:: with SMTP id d28mr2390825lfm.246.1629975520883; Thu, 26 Aug 2021 03:58:40 -0700 (PDT) Received: from guixsd ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id u2sm304879lji.82.2021.08.26.03.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 03:58:39 -0700 (PDT) From: Oleg Pykhalov References: <87bl5kbsk8.fsf@trop.in> Date: Thu, 26 Aug 2021 13:58:37 +0300 In-Reply-To: <87bl5kbsk8.fsf@trop.in> (Andrew Tropin's message of "Thu, 26 Aug 2021 09:39:38 +0300") Message-ID: <87r1eg8obm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Andrew, Andrew Tropin writes: > --- > This patch is targeted against wip-guix-home branch. > > It's not a part of any patch series to make sure it will get enough attention, > because it's most unpure part of the Guix Home and operates on user's files. > > gnu/home-services/symlink-manager.scm | 248 ++++++++++++++++++++++++++ > 1 file changed, 248 insertions(+) > create mode 100644 gnu/home-services/symlink-manager.scm > […] I applied your patch, replaces tabs with spaces, modified commit message according to GNU standards, added the file to gnu/local.mk for compilation (I forgot to do it for previous patch series, apologies). I would like to squash the patch for home-services.scm with a previous series (hope force push will work), but I should ask you could I do it? Otherwise I could just push two patches to wip-guix-home. Updated patches are attached below. Oleg. From 8938342edec4dda6ff2b7b5d47f63809bb309084 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 26 Aug 2021 09:39:38 +0300 Subject: [PATCH 2/2] home-services: Add symlink-manager. * gnu/home-services/symlink-manager.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add this. Signed-off-by: Oleg Pykhalov --- gnu/home-services/symlink-manager.scm | 247 ++++++++++++++++++++++++++ gnu/local.mk | 1 + 2 files changed, 248 insertions(+) create mode 100644 gnu/home-services/symlink-manager.scm diff --git a/gnu/home-services/symlink-manager.scm b/gnu/home-services/symlink-manager.scm new file mode 100644 index 0000000000..47fee8db3b --- /dev/null +++ b/gnu/home-services/symlink-manager.scm @@ -0,0 +1,247 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Andrew Tropin +;;; Copyright © 2021 Xinglu Chen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu home-services symlink-manager) + #:use-module (gnu home-services) + #:use-module (guix gexp) + #:export (home-symlink-manager-service-type)) + +;;; Comment: +;;; +;;; symlink-manager cares about configuration files: it backups files +;;; created by user, removes symlinks and directories created by +;;; previous generation, and creates new directories and symlinks to +;;; configs according to content of files/ directory of current home +;;; environment generation (created by home-files-service). +;;; +;;; Code: + +(define (update-symlinks-script) + (program-file + "update-symlinks" + #~(begin + (use-modules (ice-9 ftw) + (ice-9 curried-definitions) + (ice-9 match) + (srfi srfi-1)) + (define ((simplify-file-tree parent) file) + "Convert the result produced by `file-system-tree' to less +verbose and more suitable for further processing format. + +Extract dir/file info from stat and compose a relative path to the +root of the file tree. + +Sample output: + +((dir . \".\") + ((dir . \"config\") + ((dir . \"config/fontconfig\") + (file . \"config/fontconfig/fonts.conf\")) + ((dir . \"config/isync\") + (file . \"config/isync/mbsyncrc\")))) +" + (match file + ((name stat) `(file . ,(string-append parent name))) + ((name stat children ...) + (cons `(dir . ,(string-append parent name)) + (map (simplify-file-tree + (if (equal? name ".") + "" + (string-append parent name "/"))) + children))))) + + (define ((file-tree-traverse preordering) node) + "Traverses the file tree in different orders, depending on PREORDERING. + +if PREORDERING is @code{#t} resulting list will contain folders before +files located in those folders, otherwise folders will appear only +after all nested items already listed." + (let ((prepend (lambda (a b) (append b a)))) + (match node + (('file . path) (list node)) + ((('dir . path) . rest) + ((if preordering append prepend) + (list (cons 'dir path)) + (append-map (file-tree-traverse preordering) rest)))))) + + (use-modules (guix build utils)) + + (let* ((he-path (string-append (getenv "HOME") "/.guix-home")) + (new-he-tmp-path (string-append he-path ".new")) + (new-home (getenv "GUIX_NEW_HOME"))) + (symlink new-home new-he-tmp-path) + (rename-file new-he-tmp-path he-path)) + + (let* ((config-home (or (getenv "XDG_CONFIG_HOME") + (string-append (getenv "HOME") "/.config"))) + + (he-path (string-append (getenv "HOME") "/.guix-home")) + (new-he-tmp-path (string-append he-path ".new")) + + (files-path (string-append he-path "/files")) + ;; Leading dot is required, because files itself is symlink and + ;; to make file-system-tree works it should be a directory. + (files-dir-path (string-append files-path "/.")) + (new-files-path (string-append new-he-tmp-path "/files")) + (new-files-dir-path (string-append files-path "/.")) + + (home-path (getenv "HOME")) + (backup-dir (string-append home-path "/" + (number->string (current-time)) + "-guix-home-legacy-configs-backup")) + + (old-tree (if (file-exists? files-dir-path) + ((simplify-file-tree "") + (file-system-tree files-dir-path)) + #f)) + (new-tree ((simplify-file-tree "") + (file-system-tree new-files-dir-path))) + + (get-source-path + (lambda (path) + (readlink (string-append files-path "/" path)))) + + (get-target-path + (lambda (path) + (string-append home-path "/." path))) + + (get-backup-path + (lambda (path) + (string-append backup-dir "/." path))) + + (directory? + (lambda (path) + (equal? (stat:type (stat path)) 'directory))) + + (empty-directory? + (lambda (dir) + (equal? (scandir dir) '("." "..")))) + + (symlink-to-store? + (lambda (path) + (and + (equal? (stat:type (lstat path)) 'symlink) + (store-file-name? (readlink path))))) + + (backup-file + (lambda (path) + (mkdir-p backup-dir) + (format #t "Backing up ~a..." (get-target-path path)) + (mkdir-p (dirname (get-backup-path path))) + (rename-file (get-target-path path) (get-backup-path path)) + (display " done\n"))) + + (cleanup-symlinks + (lambda () + (let ((to-delete ((file-tree-traverse #f) old-tree))) + (display + "Cleaning up symlinks from previous home-environment.\n\n") + (map + (match-lambda + (('dir . ".") + (display "Cleanup finished.\n\n")) + + (('dir . path) + (if (and + (file-exists? (get-target-path path)) + (directory? (get-target-path path)) + (empty-directory? (get-target-path path))) + (begin + (format #t "Removing ~a..." + (get-target-path path)) + (rmdir (get-target-path path)) + (display " done\n")) + (format + #t "Skipping ~a (not an empty directory)... done\n" + (get-target-path path)))) + + (('file . path) + (when (file-exists? (get-target-path path)) + ;; DO NOT remove the file if it was modified + ;; by user (not a symlink to the /gnu/store + ;; anymore) it will be backed up later during + ;; create-symlinks phase. + (if (symlink-to-store? (get-target-path path)) + (begin + (format #t "Removing ~a..." (get-target-path path)) + (delete-file (get-target-path path)) + (display " done\n")) + (format + #t + "Skipping ~a (not a symlink to store)... done\n" + (get-target-path path)))))) + to-delete)))) + + (create-symlinks + (lambda () + (let ((to-create ((file-tree-traverse #t) new-tree))) + (map + (match-lambda + (('dir . ".") + (display + "New symlinks to home-environment will be created soon.\n") + (format + #t "All conflicting files will go to ~a.\n\n" backup-dir)) + + (('dir . path) + (let ((target-path (get-target-path path))) + (when (and (file-exists? target-path) + (not (directory? target-path))) + (backup-file path)) + + (if (file-exists? target-path) + (format + #t "Skipping ~a (directory already exists)... done\n" + target-path) + (begin + (format #t "Creating ~a..." target-path) + (mkdir target-path) + (display " done\n"))))) + + (('file . path) + (when (file-exists? (get-target-path path)) + (backup-file path)) + (format #t "Symlinking ~a -> ~a..." + (get-target-path path) (get-source-path path)) + (symlink (get-source-path path) (get-target-path path)) + (display " done\n"))) + to-create))))) + + (when old-tree + (cleanup-symlinks)) + + (create-symlinks) + + (display " done\nFinished updating symlinks.\n\n"))))) + + +(define (update-symlinks-gexp _) + #~(primitive-load #$(update-symlinks-script))) + +(define home-symlink-manager-service-type + (service-type (name 'home-symlink-manager) + (extensions + (list + (service-extension + home-activation-service-type + update-symlinks-gexp))) + (default-value #f) + (description "Provide an @code{update-symlinks} +script, which create and remove symlinks on every activation. If the +target is occupied by a file created by user, back it up."))) diff --git a/gnu/local.mk b/gnu/local.mk index bd3aed77e8..91c3b0da3d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -73,6 +73,7 @@ GNU_SYSTEM_MODULES = \ %D%/bootloader/depthcharge.scm \ %D%/ci.scm \ %D%/home-services.scm \ + %D%/home-services/symlink-manager.scm \ %D%/image.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ -- 2.32.0