install.sh: fix font dir doubling

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index b33d374b128d977d5f69245f4ab04274a228becb..b28eb8138f758a567ce92a4494552e718ee3632e 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -19,17 +19,19 @@ cache="${XDG_CACHE_HOME#$DEST/}"
 
 # test
 devnull=/dev/null
 
 # 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 "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {

+        echo "-- cd $PWD --> $*";

         cd $*;
         cd $*;

-        echo "-- cd $* --> $PWD";

     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"
     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"

+    alias rmdir="echo -- rmdir"

     alias ln="echo -- ln"
     alias rm="echo -- rm"
     alias ln="echo -- ln"
     alias rm="echo -- rm"

+    alias mv="echo -- mv"

     alias sh="echo -- sh"
 fi
 
     alias sh="echo -- sh"
 fi
 


@@ -48,6 +50,9 @@ case "$OSTYPE" in
     netbsd|openbsd*)    lnargs=-sfhv;;
 esac
 
     netbsd|openbsd*)    lnargs=-sfhv;;
 esac
 

+# save pwd
+old_pwd="$PWD"
+

 cd "$DEST"
 
 # create preferred folder structure
 cd "$DEST"
 
 # create preferred folder structure


@@ -64,7 +69,7 @@ find . "$share" "$etc" \
      -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c '
        r="$(realpath "{}")"
        [ "${r#'"$SRC"'/}" != "$r" ] &&
      -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c '
        r="$(realpath "{}")"
        [ "${r#'"$SRC"'/}" != "$r" ] &&

-         '"$([ "$1" = test ] && echo 'echo +++ ')"'unlink "{}"' \;
+         '"$([ "${DOTFILES_TEST+x}" = x ] && echo 'echo +++ ')"'unlink "{}"' \;

 
 cd "$SRC" >$devnull
 
 
 cd "$SRC" >$devnull
 


@@ -93,7 +98,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do
             done
             ;;
         fonts)
             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 ] &&
                 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 ] &&


@@ -123,14 +128,64 @@ if command -v gpg >$devnull 2>&1; then
 fi
 
 # ssh
 fi
 
 # ssh

-find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
-  l ".$x"; done
+if command -v ssh >$devnull 2>&1; then
+    mkdir -pm 700 "$DEST/.ssh"
+    find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
+      l ".$x"
+    done
+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"
+    find librewolf -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
 
 # 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' "$share/fonts/Dina-ttf/Dina.ttf"
+    l '.termux/font.ttf' "gui/fonts/Dina-ttf/Dina.ttf"

 fi
 
 fi
 

-# vim: sts=4 sw=4 et
+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
+        return;
+    fi
+    mkdir -p "$1"
+    if [ $? -eq 0 -a -n "$2" -a -d "$2" ]; then
+        mv "$2"/* $1
+        rmdir "$2"
+    fi
+}
+fixup_xdg_home "$XDG_DESKTOP_DIR"     Desktop
+fixup_xdg_home "$XDG_DOWNLOAD_DIR"    Downloads
+fixup_xdg_home "$XDG_TEMPLATES_DIR"
+fixup_xdg_home "$XDG_PUBLICSHARE_DIR" Public
+fixup_xdg_home "$XDG_DOCUMENTS_DIR"   Documents
+fixup_xdg_home "$XDG_MUSIC_DIR"       Music
+fixup_xdg_home "$XDG_PICTURES_DIR"    Pictures
+fixup_xdg_home "$XDG_VIDEOS_DIR"      Videos
+
+cd "$old_pwd"