X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/c502db453fe691c9065bd1cac095c734f4b071f1..e3a45d88013669e35ae1fa5078764ee779ef1426:/install.sh?ds=inline diff --git a/install.sh b/install.sh index 0d51072..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 @@ -47,14 +48,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` -x="$HOME/src/docker-abuild/dabuild" -if [ -e "$x" ]; then - l "$HOME/bin/`basename "$x"`" "$x" -fi 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 @@ -72,22 +71,17 @@ 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 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 -# .zprofile also sources .zshenv for compatibility -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"