add gpg, update install.sh, fix .zshenv.local

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 23a19100b0e37ddf97cc31f8e328fd660b7b464d..25e094a1845ce034326a6673ac67c934cf4565d8 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -21,7 +21,7 @@ fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes >$devnull 2>&1
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes .gnupg >$devnull 2>&1
 mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
 cd - >$devnull
 
@@ -47,16 +47,12 @@ l() {
 find base -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done
-# requires existing source tree and `make dabuild`
-for x in dabuild dabuild-admin; do
-       x="$HOME/src/docker-abuild/$x"
-       if [ -e "$x" ]; then
-               l "$HOME/bin/`basename "$x"`" "$x"
-       fi
-done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/$x"
 done
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
+done
 find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/etc/`basename "$x"`"
 done
@@ -74,9 +70,14 @@ done
 find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
        l "$HOME/.themes/`basename "$x"`"
 done
-find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
-       l "$HOME/share/fonts/`basename "$x"`"
+find gpg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
+       l "$HOME/.gnupg/`basename "$x"`"
 done
+if which gpg >/dev/null; then
+       find gpg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
+               gpg --import "$x"
+       done
+fi
 
 # run .zprofile to set up tmp
 # .zprofile also sources .zshenv for compatibility