From unknown Sat Jun 14 05:12:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77524] [PATCH v4 4/6] system & home: profile: Address issues reported by =?UTF-8?Q?=E2=80=98shellcheck=E2=80=99.?= Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, hako@ultrarare.space, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Fri, 04 Apr 2025 03:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77524 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77524@debbugs.gnu.org Cc: Hilton Chain , Andrew Tropin , Hilton Chain , Janneke Nieuwenhuizen , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tanguy Le Carrour X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Hilton Chain , Janneke Nieuwenhuizen , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tanguy Le Carrour Received: via spool by submit@debbugs.gnu.org id=B.174373703610001 (code B ref -1); Fri, 04 Apr 2025 03:24:04 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2025 03:23:56 +0000 Received: from localhost ([127.0.0.1]:36544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Xeu-0002b9-2H for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:23:56 -0400 Received: from lists.gnu.org ([2001:470:142::17]:32936) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0Xeq-0002aC-Vu for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:23:53 -0400 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 1u0Xel-0006tG-Kv for guix-patches@gnu.org; Thu, 03 Apr 2025 23:23:47 -0400 Received: from mx.boiledscript.com ([88.99.243.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0Xej-0002iM-G1 for guix-patches@gnu.org; Thu, 03 Apr 2025 23:23:47 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1743737023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KBfXMoYrTKnp336HbrqSH0vt0n8oYOd2N4/8TUJiN80=; b=IszScpr73bD4wpjVvkyg6KHPU/4C1qRTQ8DjZCLjcpPanC85qTkl6MTile69BwReBhsStJ 0prmOASNBht41IVtlBv2UGajLmxbuWMNsrwxHDmyDq6F1hyoB8voF8kSXLYVgb9jIrnaFP 6lTG049g7yXKpQdMpBCXKaRQcy16ORjPZyhIDTwfSSHJz/6TOB7Pc2EAgnao4fGIxEvWOp cSyn/sC4tsgTIiAiMflulCybHOVVsVQh6nthgmWwLuO28L8seJ8SSRq+B54Jbf/fkwd8+k OhH3poPuVb8LLhH20GlhW3fDrJ47Mts63zHPQwIMRmcgxFasR7K53t6TTcLztg== Date: Fri, 4 Apr 2025 11:23:01 +0800 Message-ID: <949ac4740c8aa6e91b4b1a3c724d9394c2335127.1743736516.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-MS-Reactions: disallow Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=88.99.243.112; envelope-from=hako@ultrarare.space; helo=mx.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/system.scm (operating-system-etc-service)[profile]: Address issues reported by ‘shellcheck’. * gnu/home/services.scm (environment-variables->setup-environment-script): Likewise. * gnu/home/services/shells.scm (add-shell-profile-file): Likewise. Change-Id: I4e230fd239b8a8450da6ee0c2e58746c9cc38785 --- gnu/home/services.scm | 16 ++++++++++------ gnu/home/services/shells.scm | 4 ++-- gnu/system.scm | 10 +++++----- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 6be1a49a90..769bc1c033 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -287,27 +287,31 @@ (define (environment-variables->setup-environment-script vars) case $GUIX_LOCPATH in *$GUIX_PROFILE/lib/locale*) ;; - *) export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale:$GUIX_LOCPATH ;; + *) export GUIX_LOCPATH=\"$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH\" ;; esac case $XDG_DATA_DIRS in *$GUIX_PROFILE/share*) ;; - *) export XDG_DATA_DIRS=$GUIX_PROFILE/share:$XDG_DATA_DIRS ;; + *) export XDG_DATA_DIRS=\"$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS\" ;; esac +# When MANPATH is unset, add a trailing colon so the system default search path +# is used. case $MANPATH in *$GUIX_PROFILE/share/man*) ;; - *) export MANPATH=$GUIX_PROFILE/share/man:$MANPATH + *) export MANPATH=\"$GUIX_PROFILE/share/man:$MANPATH\" ;; esac +# When INFOPATH is unset, add a trailing colon so Emacs searches +# 'Info-default-directory-list'. case $INFOPATH in *$GUIX_PROFILE/share/info*) ;; - *) export INFOPATH=$GUIX_PROFILE/share/info:$INFOPATH ;; + *) export INFOPATH=\"$GUIX_PROFILE/share/info:$INFOPATH\" ;; esac case $XDG_CONFIG_DIRS in *$GUIX_PROFILE/etc/xdg*) ;; - *) export XDG_CONFIG_DIRS=$GUIX_PROFILE/etc/xdg:$XDG_CONFIG_DIRS ;; + *) export XDG_CONFIG_DIRS=\"$GUIX_PROFILE/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS\" ;; esac case $XCURSOR_PATH in *$GUIX_PROFILE/share/icons*) ;; - *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;; + *) export XCURSOR_PATH=\"$GUIX_PROFILE/share/icons${XCURSOR_PATH:+:}$XCURSOR_PATH\" ;; esac # Keep the shell environment clean. diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 35c0c52a8e..97c9331e18 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -87,13 +87,13 @@ (define (add-shell-profile-file config) ,(mixed-text-file "shell-profile" "\ -HOME_ENVIRONMENT=$HOME/.guix-home +HOME_ENVIRONMENT=\"$HOME/.guix-home\" # Skip if already sourced. case $INFOPATH in *$HOME_ENVIRONMENT/profile/share/info*) ;; *) . \"$HOME_ENVIRONMENT/setup-environment\" ;; esac -$HOME_ENVIRONMENT/on-first-login +\"$HOME_ENVIRONMENT/on-first-login\" unset HOME_ENVIRONMENT\n" (serialize-configuration config diff --git a/gnu/system.scm b/gnu/system.scm index b67d26b648..cf93ea0fcb 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1071,11 +1071,11 @@ (define* (operating-system-etc-service os) # loaded when someone logs in via SSH. See . # We need 'PATH' to be defined here, for 'cat' and 'cut'. Do this before # reading the user's 'etc/profile' to allow variables to be overridden. -if [ -f /etc/environment -a -n \"$SSH_CLIENT\" \\ - -a -z \"$LINUX_MODULE_DIRECTORY\" ] +if [ -f /etc/environment ] && [ -n \"$SSH_CLIENT\" ] && + [ -z \"$LINUX_MODULE_DIRECTORY\" ] then . /etc/environment - export `/run/current-system/profile/bin/cut -d= -f1 < /etc/environment` + export \"$(/run/current-system/profile/bin/cut -d= -f1 < /etc/environment)\" fi # Set up environment for all default profiles. @@ -1154,10 +1154,10 @@ (define* (operating-system-etc-service os) unset HOME_ENVIRONMENT # Prepend search paths not in a profile. -export PATH=/run/privileged/bin:$PATH +export PATH=\"/run/privileged/bin:$PATH\" export XCURSOR_PATH=\"$HOME/.icons:$XCURSOR_PATH\" -if [ -n \"$BASH_VERSION\" -a -f /etc/bashrc ] +if [ -n \"$BASH_VERSION\" ] && [ -f /etc/bashrc ] then # Load Bash-specific initialization code. . /etc/bashrc -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 23:27:03 2025 Received: (at control) by debbugs.gnu.org; 4 Apr 2025 03:27:04 +0000 Received: from localhost ([127.0.0.1]:36580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Xhv-0002oo-Bz for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:27:03 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:47190) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0Xhr-0002oL-Ek for control@debbugs.gnu.org; Thu, 03 Apr 2025 23:27:00 -0400 Date: Fri, 04 Apr 2025 11:26:02 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1743737217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=1cb6Pxl7vmZdVWKjwiEtbTf2vtKoBRAoWds+NG/Amsw=; b=LkIp6WkNK5NOiyZhomWJTqWD6aHdo7i/tJW1qI40rFJ8dTTeeydesXZTyT5zMNiEJCBvpZ 8TFSzdwfiZqPT+Hjp1cVB2p9YdCLNxn2BFoUJohIMhtqtVnBQVsBpoHRO5FIAnq9xZ+JoV 4glte2IjroLB7xg2E12QlgY23cOauNUvRPakKeRI6KgEtJ9hMbpWrbGHBaMU37pWKvFMqR zKC+Ut6PRH6rw6IfBs4wmDGOCaaxCJtwEuLstPS+TcO9ubmaoQMk0oUO0rdk7CUkXi2sf8 8k7rcfdCenQkmSS81LKAgfFtGOH3fMvirUDtiNHOzJ4gIwDE2F710GQJIFZpbQ== Message-ID: <87plhsppyt.wl-hako@ultrarare.space> From: Hilton Chain To: control@debbugs.gnu.org Subject: Control message MIME-Version: 1.0 X-MS-Reactions: disallow Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 77035 77522 77523 77524 77525 77526 77527 77528 quit From unknown Sat Jun 14 05:12:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77524] [PATCH v4 4/6] system & home: profile: Address issues reported by =?UTF-8?Q?=E2=80=98shellcheck=E2=80=99.?= Resent-From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Apr 2025 01:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77524 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 77524@debbugs.gnu.org, Janneke Nieuwenhuizen , Tanguy Le Carrour , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Andrew Tropin Received: via spool by 77524-submit@debbugs.gnu.org id=B77524.174502663211577 (code B ref 77524); Sat, 19 Apr 2025 01:38:05 +0000 Received: (at 77524) by debbugs.gnu.org; 19 Apr 2025 01:37:12 +0000 Received: from localhost ([127.0.0.1]:53885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5x8q-00030f-G2 for submit@debbugs.gnu.org; Fri, 18 Apr 2025 21:37:12 -0400 Received: from mail.envs.net ([5.199.136.28]:42762) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5x8n-00030T-J0 for 77524@debbugs.gnu.org; Fri, 18 Apr 2025 21:37:10 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id A7FF838A409F; Sat, 19 Apr 2025 01:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1745026628; bh=VycQRu/9s2M03THxcwe25qGO71zlg31vEKwB+oWb2Aw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=nNkPqoJMcfYOWPvqczoBVKxFEaBXIbEqo8J5hN3Qpf/fQ85pBubV3hQNKX9J8rieX 9XzATuXnVbedwqOLwP1OzF3124XhOkzdl2RAEoWZJWT6/xJHjOoju2vm2g0Fs9Ec4d HxzqeWXBb4uIQTuJFIqrbDyPEMUsmrs51h4OpCJ4qrd5RlXyRQNJqFEjy32FvxQfVs J32D+RWff3jNvGKA2ZE0Fe7aUC4oRvAruEQQjyDuTeCls2MIET8V8nUmz6tQfb/Yjf 6VwlwCDdFsFbMJPVVMHnYlDJIbgLK9QZSQtO8/ou303iw/2fGqGPZguqpkcwgS6gT4 h58Wrb7e77Dxfz3lfkI1AgdkTsccCwkSDU/BH71ARCfONtvkz7L00Pbe8cK0sm5FTG vvHcXlRMgR4Ow8UxqcJJiXOnW7WhWtrgkbZkHY1XKXF8aEyXcn0kJu3Ds+bYGh5ngh U4et2izSoRCBZ8gxj3kyKUYJltbxNS86PSB7Lbu7NzAuODf5ywWkopaFNLHdvzEnW7 OFV/6c4wqt3bWDeLFfOab7LyR4/oZJvDhtVacFwDISx1itsgw7ZieMtVRLTl1xVKtN C8lqlH7DPpBRp/B9Nq9CPIMQ7L7smvC8Q53qUWj8IsDCjRTiMEu8dLWiK7vC8YIoel 28VV3o2BNglyanHY+PBdPPpc= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Y3t0wwiuQpz5; Sat, 19 Apr 2025 01:36:59 +0000 (UTC) Received: from localhost (unknown [112.44.73.128]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 19 Apr 2025 01:36:59 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 55509454; Sat, 19 Apr 2025 01:41:56 +0000 (UTC) From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= In-Reply-To: <949ac4740c8aa6e91b4b1a3c724d9394c2335127.1743736516.git.hako@ultrarare.space> (Hilton Chain's message of "Fri, 4 Apr 2025 11:23:01 +0800") References: <949ac4740c8aa6e91b4b1a3c724d9394c2335127.1743736516.git.hako@ultrarare.space> Date: Sat, 19 Apr 2025 09:41:56 +0800 Message-ID: <87ikn1gc63.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hilton Chain writes: > * gnu/system.scm (operating-system-etc-service)[profile]: Address issues > reported by =E2=80=98shellcheck=E2=80=99. > * gnu/home/services.scm (environment-variables->setup-environment-script): > Likewise. > * gnu/home/services/shells.scm (add-shell-profile-file): Likewise. LGTM, Reviewed-by: =E5=AE=8B=E6=96=87=E6=AD=A6