From 6219cb31261fde2e7f3903c3d9aa6a18cfd403a0 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sat, 14 Jan 2017 18:35:34 +0100
Subject: [PATCH 1/2] Stuff

---
 scripts/installPreferences.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/installPreferences.sh b/scripts/installPreferences.sh
index fd6175a..dc189c5 100755
--- a/scripts/installPreferences.sh
+++ b/scripts/installPreferences.sh
@@ -40,7 +40,7 @@ function install-preferences {
     # System detection
     if which pacman &> /dev/null; then
         ARCH=1
-        if [ $ADMIN ]; then
+        if [ $ADMIN == 1 ]; then
             sudo pacman -Sy
             function installOne { # package
                 pacman -Q $1 &> /dev/null
@@ -83,7 +83,7 @@ function install-preferences {
 
     elif which dpkg &> /dev/null; then
         DEBIAN=1
-        if [ $ADMIN ]; then
+        if [ $ADMIN == 1 ]; then
             apt-get update
             function installOne { # package
                 STATUS=$(mktemp)
@@ -179,7 +179,7 @@ function install-preferences {
 
     # Common GUI
 
-    if [ $GUI ]; then
+    if [ $GUI == 1 ]; then
         # Desktop manager
         inst i3 i3lock dmenu dunst unclutter xautolock feh numlockx scrot
         if [ $DEBIAN ]; then
@@ -208,7 +208,7 @@ function install-preferences {
         fi
     fi
 
-    if [ $EXTRA ]; then
+    if [ $EXTRA == 1 ]; then
         # Extra CLI
         inst sl
 
@@ -217,7 +217,7 @@ function install-preferences {
         fi
 
         # Extra GUI
-        if [ $GUI ]; then
+        if [ $GUI == 1 ]; then
             inst vlc gimp mpd vimpc
 
             if [ $ARCH ]; then

From 67c5528b07a2cfb88304ffccbb3cf562aa06070a Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sat, 14 Jan 2017 18:42:55 +0100
Subject: [PATCH 2/2] Thingies

---
 Xresources.d/configure | 5 +++--
 config/i3/sshmenu      | 2 +-
 scripts/debloc.sh      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Xresources.d/configure b/Xresources.d/configure
index dadc9d7..b22a5f0 100755
--- a/Xresources.d/configure
+++ b/Xresources.d/configure
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-wget https://raw.githubusercontent.com/solarized/xresources/master/Xresources.light -O solarized.light
-wget https://raw.githubusercontent.com/solarized/xresources/master/Xresources.dark -O solarized.dark
+wget "https://raw.githubusercontent.com/solarized/xresources/master/Xresources.light" -O solarized.light
+wget "https://raw.githubusercontent.com/solarized/xresources/master/Xresources.dark" -O solarized.dark
 mkdir -p $HOME/.local/share/fonts
 echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do
     cd $HOME/.local/share/fonts
     wget http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf
 done)
+wget "https://aur.archlinux.org/cgit/aur.git/plain/icons.ttf?h=ttf-font-icons" -O $HOME/.local/share/fonts/icons.ttf
 
diff --git a/config/i3/sshmenu b/config/i3/sshmenu
index 9601712..00cf7fa 100755
--- a/config/i3/sshmenu
+++ b/config/i3/sshmenu
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ "$1" == 'root' ]; then
     a=" (root)"
     b="sudo -E "
diff --git a/scripts/debloc.sh b/scripts/debloc.sh
index 99103b9..e243e70 100755
--- a/scripts/debloc.sh
+++ b/scripts/debloc.sh
@@ -25,8 +25,8 @@ mkdir -p $DEBLOC_ROOT &> /dev/null
 
 export PATH="$DEBLOC_ROOT/usr/bin:$DEBLOC_ROOT/usr/games/:$DEBLOC_ROOT/usr/lib/git-core:$PATH"
 export LIBRARY_PATH="$DEBLOC_LD:$LIBRARY_PATH"
-export C_INCLUDE_PATH="$DEBLOC_ROOT/include:$C_INCLUDE_PATH"
-export CPLUS_INCLUDE_PATH="$DEBLOC_ROOT/include:$CPLUS_INCLUDE_PATH"
+export C_INCLUDE_PATH="$DEBLOC_ROOT/usr/include:$C_INCLUDE_PATH"
+export CPLUS_INCLUDE_PATH="$DEBLOC_ROOT/usr/include:$CPLUS_INCLUDE_PATH"
 export LD_LIBRARY_PATH="$DEBLOC_LD:$LD_LIBRARY_PATH"
 export PYTHONPATH="$DEBLOC_ROOT/usr/lib/python3/dist-packages:$PYTHONPATH"
 export QT_QPA_PLATFORM_PLUGIN_PATH="$DEBLOC_ROOT/usr/lib/x86_64-linux-gnu/qt5/plugins/platforms"