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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 2.2

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

+# Version: 2.3

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

 # Created in: 2014-09-03

-# Modified in: 2016-01-07

+# Modified in: 2016-01-17

 # Licence: GPL v3

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

 # Versions #

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

+# v2.3 - 2016-01-17: email address updated / version in usage message / temporary files removed after downloading if present but error or after dry-run / "a" included in the list of checked letter for chmod

 # 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

@@ -30,6 +31,8 @@ aim="Synchronize files from a git server on this terminal."

 # v0.1 - 2014-09-23: dry-run option added / no check certifcate option added for wget

 # v0.0 - 2014-09-03: creation

+version=$(grep -i -m 1 "version" "$0" | cut -d ":" -f 2 | sed "s/ *//")

+

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

@@ -52,6 +55,8 @@ function usage {

 Aim: $aim

+Version: $version

+

 Options:

     -l, --list      Text file containing both remote and local path of

                     a given file for synchronization.

@@ -159,11 +164,7 @@ fi

 while read line

 do

-<<<<<<< HEAD

-    # Remove comments from list file

-=======

     # Remove comments from line

->>>>>>> git-sync.sh

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

     # Skip if empty line

@@ -205,6 +206,7 @@ do

     if [[ $? != 0 ]]

     then

         warning "${mydst##*/}: An error occured during the downloading. Skipping..."

+        [[ -f "$mydst_tmp" ]] && rm "$mydst_tmp"

         continue

     # Check if destination file exists

     elif [[ ! -e "$mydst" ]]

@@ -225,6 +227,7 @@ do

             if [[ $dry == 1 ]]

             then

                 info "${mydst##*/}: new version available."

+                rm "$mydst_tmp"

             else

                 mv "$mydst_tmp" "$mydst"

                 info "${mydst##*/} updated."

@@ -234,10 +237,10 @@ do

         fi

     fi

-    if [[ -z $dry && -n "$mymod" && -n $(echo "$mymod" | sed -n "/[u,o,g,][+,-][r,w,x,s,t,S,T]/p") ]]

+    if [[ -z $dry && -n "$mymod" && -n $(echo "$mymod" | sed -n "/[a,u,o,g,][+,-][r,w,x,s,t,S,T]/p") ]]

     then

         chmod "$mymod" "$mydst"

-    elif [[ -z $dry && -n "$mymod" && -z $(echo "$mymod" | sed -n "/[u,o,g,][+,-][r,w,x,s,t,S,T]/p") ]]

+    elif [[ -z $dry && -n "$mymod" && -z $(echo "$mymod" | sed -n "/[a,u,o,g,][+,-][r,w,x,s,t,S,T]/p") ]]

     then

         warning "${mydst##*/}: Impossible to change permission, \"$mymod\" does not follow the syntax of the chmod command (see help)."

         continue