X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/152474f63f971b4c543a896c11f2c6db5a4c2d41..4be2bcd2e2f69ffa226d75f6e06ca2280a164cee:/install.sh?ds=sidebyside

diff --git a/install.sh b/install.sh
index bff209a..2da2589 100755
--- a/install.sh
+++ b/install.sh
@@ -21,7 +21,8 @@ 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 .ssh .termux >$devnull 2>&1
 mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
 cd - >$devnull
 
@@ -50,13 +51,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 +68,20 @@ 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 2>&1; 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
-zsh ~/.zprofile
+for y in ssh termux; do
+	find $y -mindepth 1 -maxdepth 1 | while read -r x; do
+		l "$HOME/.$y/`basename "$x"`"
+	done
+done
+x='fonts/Dina-ttf/Dina.ttf' l "$HOME/.termux/font.ttf"