X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/54b4032b4e27434a13b14a1816ed33b039073be8..HEAD:/install.sh diff --git a/install.sh b/install.sh index de5deba..073f4be 100755 --- a/install.sh +++ b/install.sh @@ -19,11 +19,11 @@ cache="${XDG_CACHE_HOME#$DEST/}" # test devnull=/dev/null -if [ "$1" = "test" ]; then +if [ "${DOTFILES_TEST+x}" = x ]; then echo "Running test -- no changes will be applied" devnull=/dev/stdout _cd() { - echo "-- cd $* --> $PWD"; + echo "-- cd $PWD --> $*"; cd $*; } alias cd="_cd" @@ -67,9 +67,9 @@ find . "$share" "$etc" \ "$LOCAL/bin" "$share/fonts" "$share/themes" "$share/icons" \ "$etc/gnupg" .ssh .termux \ -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c ' - r="$(realpath "{}")" + r="$(realpath "{}" 2>/dev/null)" [ "${r#'"$SRC"'/}" != "$r" ] && - '"$([ "$1" = test ] && echo 'echo +++ ')"'unlink "{}"' \; + '"$([ "${DOTFILES_TEST+x}" = x ] && echo 'echo +++ ')"'unlink "{}"' \; cd "$SRC" >$devnull @@ -77,7 +77,7 @@ l() { # TODO: use install? d="$DEST/${1:-$x}" [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$SRC/${2:-$x}" "$d" || - echo "!!! File exists and is not a link: $1" + echo "!!! File exists and is not a link: $d" } # generic links @@ -98,7 +98,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do done ;; fonts) - find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do + find "$y" -mindepth 2 -maxdepth 2 -type d | while read -r x; do command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x" command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x" [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] && @@ -137,21 +137,48 @@ fi # librewolf if command -v librewolf >$devnull 2>&1; then - # XXX: MOZ_USER_DIR is compiletime, can't move to .config - mkdir -p "$DEST/.librewolf/chrome" + # XXX: MOZ_USER_DIR is compiletime, can't move to .config :( + mkdir -p "$DEST/.librewolf" find librewolf -mindepth 1 -maxdepth 1 -type f | while read -r x; do l ".$x" done - find librewolf/chrome -mindepth 1 -maxdepth 1 -type f | while read -r x; do - l ".$x" - done + profiles="$DEST/.librewolf/profiles.ini" + if [ -f "$profiles" ]; then + find librewolf/chrome -mindepth 1 -maxdepth 1 -type f | while read -r x; do + # vv arcane bullshit vv + sed -En 's/^Path=(.+)/\1/;T;p' "$profiles" | while read -r y; do + # ignore profiles that are most likely unused + # TODO: actually check profiles.ini + profile="$DEST/.librewolf/$y" + [ -d "$profile" -a -f "$profile/prefs.js" ] || continue + mkdir -p "$profile/chrome" + l "${profile#$DEST/}/chrome/${x#librewolf/chrome/}" + done + done + fi fi # termux, assume it if android if [ $(uname -o) = 'Android' ]; then mkdir -p "$DEST/.termux" find termux -mindepth 1 -maxdepth 1 | while read -r x; do l ".$x"; done - l '.termux/font.ttf' "gui/fonts/Dina-ttf/Dina.ttf" + l '.termux/font.ttf' "gui/fonts/Dina/Dina-ttf/Dina.ttf" + + # set up links for termux-setup-storage + termux_storage_link() { + d="$HOME/$1" + [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$2" "$d" || + echo "!!! File exists and is not a link: $d" + } + termux_storage_link dls storage/downloads + termux_storage_link docs storage/shared/Documents + termux_storage_link music storage/music + termux_storage_link pics storage/pictures + termux_storage_link vids storage/movies + # not xdg but convenient + termux_storage_link dcim storage/dcim + # NOTE: required for termux share target + termux_storage_link downloads storage/downloads fi cd "$DEST" >$devnull @@ -159,7 +186,8 @@ cd "$DEST" >$devnull # ensure xdg user dirs, and move old to new while we're at it . $etc/user-dirs.dirs fixup_xdg_home() { - if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then + # NOTE: ignore if xdg var empty, not absolute, or set to $HOME (in spec!) + if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1" 2>/dev/null)" = "$(realpath "$HOME")" ]; then return; fi mkdir -p "$1"