From 5207c5eb55282464a4732fe8b7df40b406ef38a3 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Fri, 12 Feb 2021 20:48:20 +0800 Subject: pull: Create the "${XDG_CONFIG_HOME}/guix" directory when needed. This fixes . * guix/scripts/pull.scm (ensure-default-profile): Add a 'mkdir-p' call before 'symlink'. --- guix/scripts/pull.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'guix/scripts/pull.scm') diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 4e0ab5d341..13d5eceada 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -39,7 +39,7 @@ close-inferior) #:use-module (guix scripts build) #:use-module (guix scripts describe) - #:autoload (guix build utils) (which) + #:autoload (guix build utils) (which mkdir-p) #:use-module ((guix build syscalls) #:select (with-file-lock/no-wait)) #:use-module (guix git) @@ -521,6 +521,7 @@ true, display what would be built without actually building it." (catch 'system-error (lambda () (false-if-exception (delete-file link)) + (mkdir-p (dirname link)) (symlink %current-profile link)) (lambda args (leave (G_ "while creating symlink '~a': ~a~%") -- cgit v1.2.3 From d0f4283c449173df9561691453b8462c9e9f99ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Mar 2021 17:25:00 +0100 Subject: pull: Expand help text for --{url,commit,branch}. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/pull.scm (show-help): Document that ‘--url’, ‘--commit’, and ‘--branch’ affect only the ‘guix’ channel (for now?). --- guix/scripts/pull.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'guix/scripts/pull.scm') diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 13d5eceada..07613240a8 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,11 +91,11 @@ Download and deploy the latest version of Guix.\n")) (display (G_ " -C, --channels=FILE deploy the channels defined in FILE")) (display (G_ " - --url=URL download from the Git repository at URL")) + --url=URL download \"guix\" channel from the Git repository at URL")) (display (G_ " - --commit=COMMIT download the specified COMMIT")) + --commit=COMMIT download the specified \"guix\" channel COMMIT")) (display (G_ " - --branch=BRANCH download the tip of the specified BRANCH")) + --branch=BRANCH download the tip of the specified \"guix\" channel BRANCH")) (display (G_ " --allow-downgrades allow downgrades to earlier channel revisions")) (display (G_ " -- cgit v1.2.3