X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/496e2ee3615fc4ceaf71a3be2c5ba3c7b8689784..bf314d35d59a4b7bd8af1ab13cb11bf29cf9452e:/install.sh

diff --git a/install.sh b/install.sh
index 0fd3dc4..25e094a 100755
--- 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,20 +70,13 @@ 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
-#XXX: potential bug with newlines in profile name (if ff even takes it)
-#XXX: only uses first profile folder, read from profiles.ini
-ffdir="`find "$HOME/.mozilla/firefox" -mindepth 1 -maxdepth 1 -type d | 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