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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 2.1

+# Version: 2.2

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

 # Created in: 2014-09-03

-# Modified in: 2015-03-12

+# Modified in: 2016-01-07

 # Licence: GPL v3

@@ -20,6 +20,7 @@ aim="Synchronize files from a git server on this terminal."

 # Versions #

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

+# v2.2 - 2016-01-07: process of list file improved (tmp list not needed anymore) / Timestamp added to the downloaded file to avoid interference with several script instance running at the same time

 # 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

@@ -137,9 +138,9 @@ then

     error "The option -l is required. Exiting...\n$(usage)\n" 1

 fi

-# Temporary list

-mydate=$(date +%N)

-tmp_list="/tmp/$(basename $list)-$mydate"

+

+# Timestamp

+myts=$(date +%N)

@@ -154,21 +155,25 @@ then

 fi

-# Remove comments from list file

-sed "/^\s*#/d;s/\s*#.*$//" "$list" > "$tmp_list"

-sed -i "/^$/d" "$tmp_list"

-

-

 # Synchronization

 while read line

 do

+    # Remove comments from list file

+    line=$(echo "$line" | sed "/^\s*#/d;s/\s*#.*$//")

+    

+    # Skip if empty line

+    if [[ -z "$line" ]]

+    then 

+        continue

+    fi

+

     # Get paths

     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##*/}"

+    mydst_tmp="/tmp/${mydst##*/}-$myts"

     # Check if mydst variable is empty or contain directory

@@ -234,11 +239,7 @@ do

         continue

     fi

-done < "$tmp_list"

-

-

-# Remove temporary list

-rm "$tmp_list"

+done < "$list"

 exit 0