github/vim-ale
1
0
Fork 0
mirror of https://github.com/webinstall/webi-installers.git synced 2026-04-20 00:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: gpg/bin -> gnupg/bin, use 'git config' for name and email

Browse Source
This commit is contained in:
AJ ONeal
2021-11-19 09:47:14 +00:00
parent 07cf1d25c2
commit 1cbc906cab
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gpg-pubkey/gpg-pubkey.sh
View File

@@ -3,9 +3,8 @@ set -e
set -u
function __get_git_email() {
grep 'email\s*=.*@' ~/.gitconfig |
tr -d '\t ' | head -n 1 |
cut -d'=' -f2
git config --global user.email
# grep 'email\s*=.*@' ~/.gitconfig | tr -d '\t ' | head -n 1 | cut -d'=' -f2
}
function __get_pubkey_id() {
@@ -20,12 +19,8 @@ function _create_gpg_key() {
return 1
fi
MY_NAME="$(
grep 'name\s*=' ~/.gitconfig |
head -n 1 |
cut -d'=' -f2 |
sed -e 's/^[\t ]*//'
)"
#grep 'name\s*=' ~/.gitconfig | head -n 1 | cut -d'=' -f2 | sed -e 's/^[\t ]*//'
MY_NAME="$(git config --global user.name)"
if [[ -z ${MY_NAME} ]]; then
return 1
fi

2
gpg/README.md
View File

@@ -90,7 +90,7 @@ You need to use `gpg-connect-agent` instead.
<string>gpg-agent</string>
<key>ProgramArguments</key>
<array>
<string>MY_HOME/.local/opt/gpg/bin/gpg-connect-agent</string>
<string>MY_HOME/.local/opt/gnupg/bin/gpg-connect-agent</string>
<string>--agent-program</string>
<string>MY_HOME/.local/opt/gnupg/bin/gpg-agent</string>
<string>--homedir</string>

24
gpg/install.sh
View File

@@ -35,7 +35,8 @@ function _install_gpg() {
ln -s gnupg-"${WEBI_VERSION}" ~/.local/opt/gnupg
pathman add ~/.local/opt/gnupg/bin
export PATH="$HOME/.local/opt/gnupg/bin/:$PATH"
export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH"
# Prep for first use
mkdir -p ~/.gnupg/
@@ -56,7 +57,7 @@ function _install_gpg() {
<string>gpg-agent</string>
<key>ProgramArguments</key>
<array>
<string>'"${HOME}"'/.local/opt/gpg/bin/gpg-connect-agent</string>
<string>'"${HOME}"'/.local/opt/gnupg/bin/gpg-connect-agent</string>
<string>--agent-program</string>
<string>'"${HOME}"'/.local/opt/gnupg/bin/gpg-agent</string>
<string>--homedir</string>
@@ -78,6 +79,10 @@ function _install_gpg() {
</plist>' > ~/Library/LaunchAgents/gpg-agent.plist
launchctl load -w ~/Library/LaunchAgents/gpg-agent.plist
sleep 3
~/.local/opt/gnupg/bin/gpg-connect-agent \
--agent-program ~/.local/opt/gnupg/bin/gpg-agent \
--homedir ~/.gnupg/ \
/bye
# (maybe) Create first key
if ! gpg --list-secret-keys | grep -q sec; then
@@ -90,21 +95,14 @@ function _create_gpg_key() {
return 0
fi
MY_NAME="$(
grep 'name\s*=' ~/.gitconfig |
head -n 1 |
cut -d'=' -f2 |
sed -e 's/^[\t ]*//'
)"
#grep 'name\s*=' ~/.gitconfig | head -n 1 | cut -d'=' -f2 | sed -e 's/^[\t ]*//'
MY_NAME="$(git config --global user.name)"
if [[ -z ${MY_NAME} ]]; then
return 0
fi
MY_EMAIL="$(
grep 'email\s*=.*@' ~/.gitconfig |
tr -d '\t ' | head -n 1 |
cut -d'=' -f2
)"
# grep 'email\s*=.*@' ~/.gitconfig | tr -d '\t ' | head -n 1 | cut -d'=' -f2
MY_EMAIL="$(git config --global user.email)"
if [[ -z ${MY_EMAIL} ]]; then
return 0
fi