From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4KQILP2EG2IJdQEAgWs5BA (envelope-from ) for ; Sun, 27 Feb 2022 15:04:45 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wM6JKP2EG2J6EwEAauVa8A (envelope-from ) for ; Sun, 27 Feb 2022 15:04:45 +0100 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 31ACB39A88 for ; Sun, 27 Feb 2022 15:04:45 +0100 (CET) Received: from localhost ([::1]:46034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOKAG-0006ul-DK for larch@yhetil.org; Sun, 27 Feb 2022 09:04:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOK0u-0000T0-97 for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOK0s-0001mD-Lq for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOK0s-0004ti-Ko for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54180] [PATCH 02/12] home: symlink-manager: Move helper procedures as top-level defines. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 13:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54180@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54180-submit@debbugs.gnu.org id=B54180.164597005518635 (code B ref 54180); Sun, 27 Feb 2022 13:55:02 +0000 Received: (at 54180) by debbugs.gnu.org; 27 Feb 2022 13:54:15 +0000 Received: from localhost ([127.0.0.1]:57140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK07-0004qU-9A for submit@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK05-0004q5-To for 54180@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:14 -0500 Received: from [2001:470:142:3::e] (port=50226 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJzl-0001Z1-HT; Sun, 27 Feb 2022 08:53:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KQEDUU7UIdoXDnp047WQ1OJGZXh84fnerJi/kb71ExM=; b=fLeQyDSHCumGKAcnnDzK k2G1Br0C7dzR9EssLhLUK8NxFC2cc/2Eku3Vj9ZPbKEIUV0OKXgM+oYsUeGCJZEKxC3TmtDz06ycC YD+RO15NT8BNIhXLMXHGYzg7D63/fJx4k2mPdsp6ZfbQ8UQgRwJ+dxKjm0NXbawwoX4v9CFgAentZ 8UFDF1NUgA6/fW46QnHVx09aqVd/nf/rJpblVjh3I2JuIuR81SSrwC2tfoEH1YDzj42+yjsh4kNZ9 j0KoV/0KbWBd6DFXoN08Y2RdWX3+bcCix6YZoMVaptue8kiFtYS/Prkm6HpoEBqFOjMpr1mzIm6uf tcZL5X5Pka1tDQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55804 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOJzk-0007Pg-8C; Sun, 27 Feb 2022 08:53:53 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 27 Feb 2022 14:53:32 +0100 Message-Id: <20220227135342.10296-2-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220227135342.10296-1-ludo@gnu.org> References: <20220227135342.10296-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645970685; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=KQEDUU7UIdoXDnp047WQ1OJGZXh84fnerJi/kb71ExM=; b=bgC0SWqScj96ZoHI0K4BhJ3mUFF/NsN6DcjhYHN8xDt5bBBB0lngggzySAlwkAOw7rX0IY z/EVN3rL2rz9P0FxUnMz6c4fsLv2hLVGcFh/4zV4Z3rGc0r9jFXOJ6u/wWVmQnuzX37xH0 qh2P2Enlvt5po71Dfi6jylxkL9EXQhKH+Y2i/JuFhMY0dyd/xJcll8kCxKl3JaewUMFdn+ gtKnh9Fku4K+gHC4m0rHki5tKFXvdG4uJBS+KrBDmL6J85GUy5N4+OhSECn0KXp40mW6ZY z7RC+uFFccObPfR35IEARsdSCGJoUgSzOGijA1Og8NwvB6CPHlxOEst/Mskc5w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645970685; a=rsa-sha256; cv=none; b=o+1nVNpc00zafDTEJhUguaBD2o6z0NZEtz8u7VXrOdfWM2Tkn8H3WmqasbH44ymiXWKHL6 Rh2akHot1Lib5A51sQraKEkkuw1AsbTKG5ZoIrX0qoUnQXZnHKq+jAWU9vOolN1y0KRRu0 nkrdyYEbLHrddhWXWJX8IbRu7HuWVF8j0EV6Wx/ltzPl/yukJJoSUKOLvPkrdsIStft/fo W6MPEZHXFGizgKF0MJDV7Ng1UIN1sqSNYh0BwahZickUo7wVZDgqWIGiyKftZHtIqNMUt9 5LRW/CgUAtNLqEZX7X2HgdPbSAJQzPrSDxiccerwA891I1byftqUr9BxvSKDEQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=fLeQyDSH; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=fLeQyDSH; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 31ACB39A88 X-Spam-Score: -2.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: dlXDfa+uns5N * gnu/home/services/symlink-manager.scm (update-symlinks-script): Remove 'config-home', which is unused. Move 'home-path', 'backup-dir', 'get-target-path', 'get-backup-path', 'directory?', 'empty-directory?', 'symlink-to-store?', and 'backup-file' to the top level. Move 'create-symlinks' and 'cleanup-symlinks' to the top level as well, and add parameters. Adjust callers. --- gnu/home/services/symlink-manager.scm | 240 +++++++++++++------------- 1 file changed, 116 insertions(+), 124 deletions(-) diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm index c60cdcffb7..25470209d1 100644 --- a/gnu/home/services/symlink-manager.scm +++ b/gnu/home/services/symlink-manager.scm @@ -88,12 +88,121 @@ (define ((file-tree-traverse preordering) node) (list (cons 'dir path)) (append-map (file-tree-traverse preordering) rest)))))) + (define home-path + (getenv "HOME")) + + (define backup-dir + (string-append home-path "/" (number->string (current-time)) + "-guix-home-legacy-configs-backup")) + + (define (get-target-path path) + (string-append home-path "/." path)) + + (define (get-backup-path path) + (string-append backup-dir "/." path)) + + (define (directory? path) + (equal? (stat:type (stat path)) 'directory)) + + (define (empty-directory? dir) + (equal? (scandir dir) '("." ".."))) + + (define (symlink-to-store? path) + (and (equal? (stat:type (lstat path)) 'symlink) + (store-file-name? (readlink path)))) + + (define (backup-file path) + (mkdir-p backup-dir) + (format #t (G_ "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 (G_ " done\n"))) + + (define (cleanup-symlinks old-tree) + ;; Delete from directory OLD-TREE symlinks that correspond to a + ;; previous generation. + (let ((to-delete ((file-tree-traverse #f) old-tree))) + (display + (G_ + "Cleaning up symlinks from previous home-environment.\n\n")) + (map + (match-lambda + (('dir . ".") + (display (G_ "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 (G_ "Removing ~a...") + (get-target-path path)) + (rmdir (get-target-path path)) + (display (G_ " done\n"))) + (format + #t + (G_ "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 is no longer a symlink to + ;; the store, it will be backed up later during + ;; create-symlinks phase. + (if (symlink-to-store? (get-target-path path)) + (begin + (format #t (G_ "Removing ~a...") (get-target-path path)) + (delete-file (get-target-path path)) + (display (G_ " done\n"))) + (format + #t + (G_ "Skipping ~a (not a symlink to store)... done\n") + (get-target-path path)))))) + to-delete))) + + (define (create-symlinks new-tree new-files-path) + ;; Create in directory NEW-TREE symlinks to the files under + ;; NEW-FILES-PATH, creating backups as needed. + (define (get-source-path path) + (readlink (string-append new-files-path "/" path))) + + (let ((to-create ((file-tree-traverse #t) new-tree))) + (map + (match-lambda + (('dir . ".") + (display + (G_ "New symlinks to home-environment will be created soon.\n")) + (format + #t (G_ "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 (G_ "Skipping ~a (directory already exists)... done\n") + target-path) + (begin + (format #t (G_ "Creating ~a...") target-path) + (mkdir target-path) + (display (G_ " done\n")))))) + + (('file . path) + (when (file-exists? (get-target-path path)) + (backup-file path)) + (format #t (G_ "Symlinking ~a -> ~a...") + (get-target-path path) (get-source-path path)) + (symlink (get-source-path path) (get-target-path path)) + (display (G_ " done\n")))) + to-create))) + #$%initialize-gettext - (let* ((config-home (or (getenv "XDG_CONFIG_HOME") - (string-append (getenv "HOME") "/.config"))) - - (he-path (string-append (getenv "HOME") "/.guix-home")) + (let* ((he-path (string-append (getenv "HOME") "/.guix-home")) (new-he-path (string-append he-path ".new")) (new-home (getenv "GUIX_NEW_HOME")) (old-home (getenv "GUIX_OLD_HOME")) @@ -103,141 +212,24 @@ (define ((file-tree-traverse preordering) node) ;; to make file-system-tree works it should be a directory. (new-files-dir-path (string-append new-files-path "/.")) - (home-path (getenv "HOME")) - (backup-dir (string-append home-path "/" - (number->string (current-time)) - "-guix-home-legacy-configs-backup")) - (old-tree (if old-home ((simplify-file-tree "") (file-system-tree (string-append old-home "/files/."))) #f)) (new-tree ((simplify-file-tree "") - (file-system-tree new-files-dir-path))) - - (get-source-path - (lambda (path) - (readlink (string-append new-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 (G_ "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 (G_ " done\n")))) - - (cleanup-symlinks - (lambda () - (let ((to-delete ((file-tree-traverse #f) old-tree))) - (display - (G_ - "Cleaning up symlinks from previous home-environment.\n\n")) - (map - (match-lambda - (('dir . ".") - (display (G_ "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 (G_ "Removing ~a...") - (get-target-path path)) - (rmdir (get-target-path path)) - (display (G_ " done\n"))) - (format - #t - (G_ "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 is no longer - ;; a symlink to the store, it will be backed - ;; up later during create-symlinks phase. - (if (symlink-to-store? (get-target-path path)) - (begin - (format #t (G_ "Removing ~a...") (get-target-path path)) - (delete-file (get-target-path path)) - (display (G_ " done\n"))) - (format - #t - (G_ "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 - (G_ "New symlinks to home-environment will be created soon.\n")) - (format - #t (G_ "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 (G_ "Skipping ~a (directory already exists)... done\n") - target-path) - (begin - (format #t (G_ "Creating ~a...") target-path) - (mkdir target-path) - (display (G_ " done\n")))))) - - (('file . path) - (when (file-exists? (get-target-path path)) - (backup-file path)) - (format #t (G_ "Symlinking ~a -> ~a...") - (get-target-path path) (get-source-path path)) - (symlink (get-source-path path) (get-target-path path)) - (display (G_ " done\n")))) - to-create))))) + (file-system-tree new-files-dir-path)))) (when old-tree - (cleanup-symlinks)) + (cleanup-symlinks old-tree)) - (create-symlinks) + (create-symlinks new-tree new-files-path) (symlink new-home new-he-path) (rename-file new-he-path he-path) (display (G_" done\nFinished updating symlinks.\n\n"))))))) - (define (update-symlinks-gexp _) #~(primitive-load #$(update-symlinks-script))) -- 2.34.0