From e6761efd8737efc286301841381560000fe44bf6 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sun, 13 Aug 2023 16:13:44 +0200 Subject: [PATCH] minor --- pkg/de-p1st-gnupg/README.md | 6 +++--- pkg/de-p1st-gnupg/interactive-shell.holoscript | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/de-p1st-gnupg/README.md b/pkg/de-p1st-gnupg/README.md index 4fac198..336e793 100644 --- a/pkg/de-p1st-gnupg/README.md +++ b/pkg/de-p1st-gnupg/README.md @@ -92,7 +92,7 @@ fi ## Note about "interactive, non-login, shell" The gnupg manual is talking about "login shell" but mentions "~/.bashrc", -so I assume they mean a "interactive, non-login, shell". +so I assume they mean an "interactive, non-login, shell". See https://wiki.archlinux.org/title/bash#Configuration_files Correct files to set `SSH_AGENT_PID` and `GPG_TTY`: @@ -100,9 +100,9 @@ Correct files to set `SSH_AGENT_PID` and `GPG_TTY`: * `/etc/bash.bashrc` * `/etc/zsh/zshrc` -These not work: +These do not work: -* `/etc/profile.d/99_gnupg.sh` does **not** work! +* `/etc/profile.d/99_gnupg.sh` > `/etc/profile` This file should be sourced by all POSIX sh-compatible shells > upon login: it sets up $PATH and other environment variables and application-specific > (/etc/profile.d/*.sh) settings upon login. diff --git a/pkg/de-p1st-gnupg/interactive-shell.holoscript b/pkg/de-p1st-gnupg/interactive-shell.holoscript index 3068052..3cb35ba 100644 --- a/pkg/de-p1st-gnupg/interactive-shell.holoscript +++ b/pkg/de-p1st-gnupg/interactive-shell.holoscript @@ -4,6 +4,7 @@ set -e cat +# shellcheck disable=SC2016 echo ' GPG_TTY=$(tty) export GPG_TTY @@ -18,4 +19,4 @@ fi' # Source import of public key if [ -f ~/import-pubkey ]; then . /etc/bashrc -fi \ No newline at end of file +fi