From 507d06d9d5f1df6f0db90d81c167177981b08e96 Mon Sep 17 00:00:00 2001 From: Tom Barrett Date: Fri, 5 Nov 2021 22:20:47 +0100 Subject: better way to do pinentry --- build | 86 +++++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 39 deletions(-) (limited to 'build') diff --git a/build b/build index a273659..a8e38e9 100755 --- a/build +++ b/build @@ -1,91 +1,99 @@ #!/usr/bin/env bash # var setup -RC_DIR=$HOME'/src/rc' +RC_DIR="$HOME/src/rc" # bin directory -mkdir $HOME/bin +mkdir "$HOME/bin" # dwm setup -DWM_DIR=$HOME'/src/dwm' -git clone https://git.tombarrett.xyz/tom/dwm $DWM_DIR +DWM_DIR="$HOME/src/dwm" +git clone https://git.tombarrett.xyz/tom/dwm "$DWM_DIR" -patch $DWM_DIR'/dwm.c' $RC_DIR'/dwm/custom.diff' +patch "$DWM_DIR/dwm.c" "$RC_DIR/dwm/custom.diff" -ln -s $RC_DIR'/dwm/config.h' $DWM_DIR +ln -s "$RC_DIR/dwm/config.h" "$DWM_DIR" -make -C $DWM_DIR +make -C "$DWM_DIR" -ln -s $DWM_DIR/dwm $HOME/bin +ln -s "$DWM_DIR/dwm" "$HOME/bin" # dwmstatus setup -DWMSTS_DIR=$HOME'/src/dwmstatus' -git clone https://git.tombarrett.xyz/tom/dwmstatus $DWMSTS_DIR +DWMSTS_DIR="$HOME/src/dwmstatus" +git clone https://git.tombarrett.xyz/tom/dwmstatus "$DWMSTS_DIR" -patch $DWMSTS_DIR'/dwmstatus.c' $RC_DIR'/dwmstatus/custom.diff' +patch "$DWMSTS_DIR/dwmstatus.c" "$RC_DIR/dwmstatus/custom.diff" -make -C $DWMSTS_DIR +make -C "$DWMSTS_DIR" -ln -s $DWMSTS_DIR/dwmstatus $HOME/bin +ln -s "$DWMSTS_DIR/dwmstatus" "$HOME/bin" # st setup -ST_DIR=$HOME'/src/st' -git clone https://git.tombarrett.xyz/tom/st $ST_DIR +ST_DIR="$HOME/src/st" +git clone https://git.tombarrett.xyz/tom/st "$ST_DIR" -ln -s $RC_DIR'/st/config.h' $ST_DIR +ln -s "$RC_DIR/st/config.h" "$ST_DIR" -make -C $ST_DIR +make -C "$ST_DIR" -ln -s $ST_DIR/st $HOME/bin +ln -s "$ST_DIR/st" "$HOME/bin" -# connmenu setup -CM_DIR=$HOME'/src/connmenu' -git clone https://git.tombarrett.xyz/tom/connmenu $CM_DIR +# pinentry-dmenu setup +PE_DIR="$HOME/src/pinentry-dmenu" +git clone https://git.tombarrett.xyz/tom/st "$PE_DIR" -ln -s $CM_DIR/connmenu $HOME/bin +make -C "$PE_DIR" + +ln -s "$PE_DIR/pinentry-dmenu" "$HOME/bin" # wallpapers setup -mkdir -p $HOME'/personal' -git clone https://git.tombarrett.xyz/tom/wallpapers $HOME'/personal/wallpapers' +mkdir -p "$HOME/personal" +git clone https://git.tombarrett.xyz/tom/wallpapers "$HOME/personal/wallpapers" -mkdir -p $HOME'/.config/' +mkdir -p "$HOME/.config/" # zsh setup -ln -s $RC_DIR'/.zshrc' $HOME +ln -s "$RC_DIR/.zshrc" "$HOME" # freedesktop setup -ln -s $RC_DIR'/.config/user-dirs.dirs' $HOME'/.config/' +ln -s "$RC_DIR/.config/user-dirs.dirs" "$HOME/.config/" # ranger setup -ln -s $RC_DIR'/.config/ranger' $HOME'/.config/' +ln -s "$RC_DIR/.config/ranger" "$HOME/.config/" # stig setup -ln -s $RC_DIR'/.config/stig' $HOME'/.config/' +ln -s "$RC_DIR/.config/stig" "$HOME/.config/" # ncmpcpp setup -ln -s $RC_DIR'/.config/ncmpcpp' $HOME'/.config/' +ln -s "$RC_DIR/.config/ncmpcpp" "$HOME/.config/" # xorg setup -ln -s $RC_DIR'/.xinitrc' $HOME +ln -s "$RC_DIR/.xinitrc" "$HOME" # autostart script -ln -s $RC_DIR'/.autostart' $HOME +ln -s "$RC_DIR/.autostart" "$HOME" # git setup -ln -s $RC_DIR'/.gitconfig' $HOME +ln -s "$RC_DIR/.gitconfig" "$HOME" # neomutt setup -ln -s $RC_DIR'/.muttrc' $HOME -ln -s $RC_DIR'/.mailcap' $HOME +ln -s "$RC_DIR/.muttrc" "$HOME" +ln -s "$RC_DIR/.mailcap" "$HOME" # taskwarrior setup -ln -s $RC_DIR'/.taskrc' $HOME -ln -s $RC_DIR'/.task' $HOME +ln -s "$RC_DIR/.taskrc" "$HOME" +ln -s "$RC_DIR/.task" "$HOME" # xscreensaver setup -ln -s $RC_DIR'/.xscreensaver' $HOME +ln -s "$RC_DIR/.xscreensaver" "$HOME" # pam setup -ln -s $RC_DIR'/.pam_environment' $HOME +ln -s "$RC_DIR/.pam_environment" "$HOME" + +# gpg setup +mkdir -p "$HOME/.gnupg" +ln -s "$RC_DIR/.gnupg/gpg-agent.conf" "$HOME/.gnupg/" +ln -s "$RC_DIR/.gnupg/pinentry-dmenu.conf" "$HOME/.gnupg/" +ln -s "$RC_DIR/scripts/pinentry-auto" "$HOME/bin" echo "use gpg --list-secret-keys --with-keygrip, write the [A] keygrip to .gnupg/sshcontrol" -- cgit v1.2.3