From 0a5266a2f9a31946213f80d669054886f2753c6d Mon Sep 17 00:00:00 2001
From: Vladimir Berezhnoy <non7top@gmail.com>
Date: Thu, 2 Jan 2014 04:19:14 +0400
Subject: [PATCH 1/3] bootstrap: fix colors, make backup safer

---
 bootstrap.sh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 367b14dd..747fc348 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,18 +3,28 @@
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
+# The different colours as variables
+Y="\033[01;33m" # YELLOW
+C="\033[01;36m" # CYAN
+W="\033[01;37m" # WHITE
+B="\033[01;34m" # BLUE
+G="\033[01;32m" # GREEN
+D="\033[01;31m" # RED
+X="\033[00;37m" # Not sure...
+R="\033[0m"
+
 
 # Notice title
-notice() { echo  "\033[1;32m=> $1\033[0m"; }
+notice() { echo -e "${G}=> $1${R}"; }
 
 # Error title
-error() { echo "\033[1;31m=> Error: $1\033[0m"; }
+error() { echo -e "${D}=> Error: $1${R}"; }
 
 # List item
-c_list() { echo  "  \033[1;32m✔\033[0m $1"; }
+c_list() { echo -e "  ${G}+${R} $1"; }
 
 # Error list item
-e_list() { echo  "  \033[1;31m✖\033[0m $1"; }
+e_list() { echo -e "  ${D}-${R} $1"; }
 
 # Check for dependency
 dep() {
@@ -29,12 +39,14 @@ dep() {
 }
 
 backup() {
+  set -e
   mkdir -p $backupdir
 
   local files=( $(ls -a) )
   for file in "${files[@]}"; do
-    in_array $file "${excluded[@]}" || cp -Rf "$HOME/$file" "$backupdir/$file"
+    in_array $file "${excluded[@]}" || mv -f "$HOME/$file" "$backupdir/$file"
   done
+  set +e
 }
 
 install() {

From 2dfb9123c86c84086ab0b527fcdd16f84a8bb9a8 Mon Sep 17 00:00:00 2001
From: Vladimir Berezhnoy <non7top@gmail.com>
Date: Thu, 2 Jan 2014 05:02:24 +0400
Subject: [PATCH 2/3] bootstrap: improve backup

---
 bootstrap.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 747fc348..6ad86ddb 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,7 +44,10 @@ backup() {
 
   local files=( $(ls -a) )
   for file in "${files[@]}"; do
-    in_array $file "${excluded[@]}" || mv -f "$HOME/$file" "$backupdir/$file"
+    in_array $file "${excluded[@]}" 
+        if [ $? -ne 0 -a -r "$HOME/$file" ]; then
+            mv -f "$HOME/$file" "$backupdir/$file"
+        fi
   done
   set +e
 }

From 7f36dd4b0eb2ce8690a95628ae6091d224fa0637 Mon Sep 17 00:00:00 2001
From: Vladimir Berezhnoy <non7top@gmail.com>
Date: Thu, 2 Jan 2014 05:19:08 +0400
Subject: [PATCH 3/3] bootstrap: improve backup

---
 bootstrap.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6ad86ddb..f0b39bc7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -39,17 +39,15 @@ dep() {
 }
 
 backup() {
-  set -e
   mkdir -p $backupdir
 
   local files=( $(ls -a) )
   for file in "${files[@]}"; do
     in_array $file "${excluded[@]}" 
         if [ $? -ne 0 -a -r "$HOME/$file" ]; then
-            mv -f "$HOME/$file" "$backupdir/$file"
+            mv -f "$HOME/$file" "$backupdir/" || { error "Cannot backup $HOME/$file"; exit 1; }
         fi
   done
-  set +e
 }
 
 install() {