fix dpass

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 2d244b1c5e8a926ea0d6cbc5d104b24a29de54ef..15b9f199c4d4235782537d04adcb43adb07321f0 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -3,72 +3,82 @@
 #NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
 
 # test
 #NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
 
 # test

+devnull=/dev/null

 if [ "$1" = "test" ]; then
 if [ "$1" = "test" ]; then

-       mkdir() { echo -- "$*"; }
+       echo "Running test -- no changes will be applied"
+       devnull=/dev/stdout
+       _cd() {
+               cd $*;
+               echo "  cd $*";
+               echo "\$PWD=$PWD";
+       }
+       alias cd="_cd"
+       alias mkdir="echo mkdir"

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

-       alias cap_mkdb="echo cap_mkdb"
-       alias unlink="echo unlink"
+       alias sh="echo sh"

 fi
 
 # create preferred folder structure
 cd ~
 fi
 
 # create preferred folder structure
 cd ~

-mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
-mkdir -pm 700 var/tmp var/tmp/vim > /dev/null 2>&1
-cd -
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes >$devnull 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
+cd - >$devnull

 
 

-# accomodate multiple userlands
-fex='-perm -ugo=x'
-lnargs=-sfnv
+# ensure ostype

 if [ -z "$OSTYPE" ]; then
        OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
 fi
 if [ -z "$OSTYPE" ]; then
        OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
 fi

+
+# accomodate multiple userlands
+lnargs=-sfnv

 case "$OSTYPE" in
 case "$OSTYPE" in

-       # TODO: make links safer for systems without -Fw
-       freebsd*)               lnargs=-sFhvw;;
+       freebsd*)               lnargs=-sFhv;;

        netbsd|openbsd*)        lnargs=-sfhv;;
        netbsd|openbsd*)        lnargs=-sfhv;;

-       # android busybox find doesn't have -executable
-       android)                fex=-executable;;

 esac
 
 l() {
        # TODO: use install?
 esac
 
 l() {
        # TODO: use install?

-       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$PWD/$x}" "$1" || \
+               echo "!!! File exists and is not a link: $1"

 }
 
 # link files
 }
 
 # link files

-find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
+find base -mindepth 1 -maxdepth 1 | while read -r x; do

        l "$HOME/`basename "$x"`"
 done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do

-       l "$HOME/$x" "$PWD/$x"
+       l "$HOME/$x"

 done
 done

-find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
+find xdg -mindepth 1 -maxdepth 1 | while read -r x; do

        l "$HOME/etc/`basename "$x"`"
 done
        l "$HOME/etc/`basename "$x"`"
 done

-find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do

        l "$HOME/.urxvt/ext/`basename $x`"
 done
        l "$HOME/.urxvt/ext/`basename $x`"
 done

-cd "$PWD/xorg"
-for y in icons themes; do
-       find $y -type d -mindepth 2 -maxdepth 2 | while read -r x; do
-               l "$HOME/.$y/`basename "$x"`" "$PWD/$x"
-       done
+find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+       if [ -e "$x/index.theme" ]; then
+               l "$HOME/.icons/`basename "$x"`"
+       fi

 done
 done

-cd -
-find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/.themes/`basename "$x"`"
+done
+find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do

        l "$HOME/share/fonts/`basename "$x"`"
 done
        l "$HOME/share/fonts/`basename "$x"`"
 done

-
-cd ~
-if [ "$OSTYPE" = "freebsd" ]; then
-       # FreeBSD tries `_secure_path' on `.login_conf' before reading the
-       # database, so it needs to be compiled and unlinked for it to actually
-       # take effect.
-       rm .login_conf.db
-       cap_mkdb .login_conf
+#XXX: potential bug with newlines in profile name (if ff even takes it)
+#XXX: breaks on multiple profiles
+ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
+if [ -d "$ffdir" ]; then
+       find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
+               l "$ffdir/`basename "$x"`"
+       done
+       cd "$ffdir"
+       echo "Updating user.js"
+       sh ./user-js-updater.sh
+       cd - >$devnull

 fi
 fi

-unlink .login_conf
+

 # run .zprofile to set up tmp
 # run .zprofile to set up tmp

-zsh .zprofile
-cd -
+zsh ~/.zprofile