add Blackbird theme, simplify xorg install

diff --git a/.gitmodules b/.gitmodules
index 7215e25a37f0a9928a325e3dfff67fe3cca82693..0861fc8b4456c192f1238c40d9eec903b6f39887 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "paper-icon-theme"]
        path = xorg/icons/paper-icon-theme
        url = https://github.com/snwh/paper-icon-theme
+[submodule "Blackbird"]
+       path = xorg/themes/Blackbird
+       url = https://github.com/shimmerproject/Blackbird

diff --git a/install.sh b/install.sh
index 2d244b1c5e8a926ea0d6cbc5d104b24a29de54ef..7e7471172195fe28021a79bee7d5d8b0b9d674d6 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -49,13 +49,12 @@ done
 find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
        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 "$PWD/xorg/icons" -type d -mindepth 2 -maxdepth 2 | while read -r x; do
+       l "$HOME/.icons/`basename "$x"`"
+done
+find "$PWD/xorg/themes" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/.themes/`basename "$x"`"
 done
-cd -
 find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/share/fonts/`basename "$x"`"
 done

diff --git a/xorg/themes/Blackbird b/xorg/themes/Blackbird
new file mode 160000 (submodule)
index 0000000..a1c5674
--- /dev/null
+++ b/xorg/themes/Blackbird
@@ -0,0 +1 @@
+Subproject commit a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4