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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 2.0

+# Version: 2.1

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

 # Created in: 2014-09-03

-# Modified in: 2015-02-27

+# Modified in: 2015-03-12

 # Licence: GPL v3

@@ -12,7 +12,7 @@

 # Aims #

 #======#

-aim="Synchronize files from git server (master branch) on this terminal."

+aim="Synchronize files from a git server on this terminal."

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

 # Versions #

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

+# v2.1 - 2015-03-12: evaluation of the variables created from the list in order to use environment variables (ie, $HOME) / directoy checked instead of created otherwise may lead to unwanted path if error in list file / usage message updated

 # v2.0 - 2015-02-27: error function improved / info function added / file installed and directory created if not already present / modification of file permission can be specified in the file list and apply to the file

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

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

@@ -46,7 +47,7 @@ function test_dep {

 # Usage message

 function usage {

     echo -e "

-    \e[32m${0##*/}\e[00m -l|--list list -d|--dry-run -h|--help

+    \e[32m${0##*/}\e[00m -l|--list file -d|--dry-run -h|--help

 Aim: $aim

@@ -163,9 +164,9 @@ while read line

 do

     # Get paths

-    mysrc=$(echo "$line" | cut -d ";" -f 1 | sed -e "s/^ *//" -e "s/ *$//")

-    mydst=$(echo "$line" | cut -d ";" -f 2 | sed -e "s/^ *//" -e "s/ *$//")

-    mymod=$(echo "$line" | cut -d ";" -f 3 | sed -e "s/^ *//" -e "s/ *$//")

+    eval mysrc=$(echo "$line" | cut -d ";" -f 1 | sed -e "s/^ *//" -e "s/ *$//")

+    eval mydst=$(echo "$line" | cut -d ";" -f 2 | sed -e "s/^ *//" -e "s/ *$//")

+    eval mymod=$(echo "$line" | cut -d ";" -f 3 | sed -e "s/^ *//" -e "s/ *$//")

     mydst_tmp="/tmp/${mydst##*/}"

@@ -177,8 +178,8 @@ do

         continue

     elif [[ $(echo "$mydst" | grep "/") && ! -d "${mydst%/*}" ]]

     then

-        info "${mydst##*/}: ${mydst%/*} directory created."

-        mkdir "${mydst%/*}"

+        warning "${mydst##*/}: ${mydst%/*} directory does not exist. Skipping..."

+        continue

     fi

     # Check if remote path is http