@@ -1,9 +1,9 @@

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 1.2

+# Version: 1.3

 # Author: Frédéric CHEVALIER <fcheval@txbiomedgenetics.org>

 # Created in: 2014-09-03

-# Modified in: 2014-09-24

+# Modified in: 2014-12-04

 # Licence: GPL v3

@@ -20,6 +20,7 @@ aim="Synchronize files from git server (master branch) on this terminal."

 # Versions #

 #==========#

+# v1.3 - 2014-12-04: warning and error functions improved

 # v1.2 - 2014-09-24: temp file bug corrected / check if local file exist

 # v1.1 - 2014-09-14: test_dep bug corrected

 # v1.0 - 2014-09-14: git dependency check replaced by wget check (bug) / test_dep function improved / remove comments in list file / check for http path / remove spaces in path / checksum loop corrected

@@ -63,14 +64,25 @@ Options:

 # Error message

 function error {

-    echo -e "\e[31mError:\e[00m $1"

-    exit $2

+    if [[ -t 1 ]]

+    then

+        echo -e "\e[31mError:\e[00m $1"

+        exit $2

+    else

+        echo -e "Error: $1"

+        exit $2

+    fi

 }

 # Warning message

 function warning {

-    echo -e "\e[33mWarning:\e[00m $1"

+    if [[ -t 1 ]]

+    then

+        echo -e "\e[33mWarning:\e[00m $1"

+    else

+        echo -e "Warning: $1"

+    fi

 }