link dabuild and dabuild-admin from docker-abuild

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index bff209a5c057f8f11a2d79063b890c2bab8bcf89..0fd3dc43805289e0e6590c0aa66532fc6584d56a 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -47,16 +47,23 @@ l() {
 find base -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done
 find base -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done

+# requires existing source tree and `make dabuild`
+for x in dabuild dabuild-admin; do
+       x="$HOME/src/docker-abuild/$x"
+       if [ -e "$x" ]; then
+               l "$HOME/bin/`basename "$x"`" "$x"
+       fi
+done

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

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

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

-find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do

        if [ -e "$x/index.theme" ]; then
                d="$HOME/.icons/`basename "$x"`"
                l $d
        if [ -e "$x/index.theme" ]; then
                d="$HOME/.icons/`basename "$x"`"
                l $d


@@ -64,15 +71,15 @@ find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
                unset d
        fi
 done
                unset d
        fi
 done

-find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do

        l "$HOME/.themes/`basename "$x"`"
 done
        l "$HOME/.themes/`basename "$x"`"
 done

-find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do

        l "$HOME/share/fonts/`basename "$x"`"
 done
 #XXX: potential bug with newlines in profile name (if ff even takes it)
        l "$HOME/share/fonts/`basename "$x"`"
 done
 #XXX: potential bug with newlines in profile name (if ff even takes it)

-#XXX: breaks on multiple profiles, read from profiles.ini
-ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
+#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 [ -d "$ffdir" ]; then
        find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
                l "$ffdir/`basename "$x"`"


@@ -84,4 +91,5 @@ if [ -d "$ffdir" ]; then
 fi
 
 # run .zprofile to set up tmp
 fi
 
 # run .zprofile to set up tmp

+# .zprofile also sources .zshenv for compatibility

 zsh ~/.zprofile
 zsh ~/.zprofile