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

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index bff209a5c057f8f11a2d79063b890c2bab8bcf89..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
 
@@ -50,13 +50,16 @@ 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
-find urxvt-ext -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done
-find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do
        if [ -e "$x/index.theme" ]; then
                d="$HOME/.icons/`basename "$x"`"
                l $d
@@ -64,24 +67,18 @@ find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
                unset d
        fi
 done
-find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
        l "$HOME/.themes/`basename "$x"`"
 done
-find fonts -type d -mindepth 1 -maxdepth 1 | 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
-#XXX: potential bug with newlines in profile name (if ff even takes it)
-#XXX: breaks on multiple profiles, read from profiles.ini
-ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
-if [ -d "$ffdir" ]; then
-       find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
-               l "$ffdir/`basename "$x"`"
+if which gpg >/dev/null; then
+       find gpg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
+               gpg --import "$x"
        done
-       cd "$ffdir"
-       echo "Updating user.js"
-       sh ./user-js-updater.sh
-       cd - >$devnull
 fi
 
 # run .zprofile to set up tmp
+# .zprofile also sources .zshenv for compatibility
 zsh ~/.zprofile