ykman-oath-reload: new + restored features

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index b33d374b128d977d5f69245f4ab04274a228becb..05d5554e3e96945d127d37cf79bd5393de71780e 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -23,13 +23,15 @@ if [ "$1" = "test" ]; then
     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {
-        cd $*;
         echo "-- cd $* --> $PWD";
+        cd $*;
     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"
+    alias rmdir="echo -- rmdir"
     alias ln="echo -- ln"
     alias rm="echo -- rm"
+    alias mv="echo -- mv"
     alias sh="echo -- sh"
 fi
 
@@ -48,6 +50,9 @@ case "$OSTYPE" in
     netbsd|openbsd*)    lnargs=-sfhv;;
 esac
 
+# save pwd
+old_pwd="$PWD"
+
 cd "$DEST"
 
 # create preferred folder structure
@@ -123,14 +128,40 @@ if command -v gpg >$devnull 2>&1; then
 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
 
 # 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
 
-# vim: sts=4 sw=4 et
+cd "$DEST" >$devnull
+
+# ensure xdg user dirs, and move old to new while we're at it
+source $etc/user-dirs.dirs
+function 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"