@@ -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

@@ -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 line

+    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

@@ -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

@@ -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

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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 1.3

+# Version: 2.0

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

 # Created in: 2014-09-03

-# Modified in: 2014-12-04

+# Modified in: 2015-02-27

 # Licence: GPL v3

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

 # Versions #

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

+# 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

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

@@ -50,10 +51,17 @@ function usage {

 Aim: $aim

 Options:

-    -l, --list      File containing remote path and local path of a file to synchronize.

-                    The list file must have a unique path pair per line and each path must

-                    be semi-colon separated (path1 ; path2). The remote path must be http path.

-                    Comments beginning by # are allowed anywhere.

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

+                    a given file for synchronization.

+                        - The list file must have a unique path pair

+                            per line and each path must be semi-colon

+                            separated (remote_path ; local_path).

+                            The \e[33mremote path\e[0m must be \e[33mhttp\e[0m a path.

+                        - Modification of file permission can be specified

+                            in a third column. The syntax is the chmod

+                            syntax (ie, remote_path ; local_path ; uog+rwx).

+                        - Comments beginning by # are allowed anywhere

+                            in the list file.

     -d, --dry-run   Run the synchronization but print a message instead of updating the files. 

@@ -67,11 +75,11 @@ function error {

     if [[ -t 1 ]]

     then

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

-        exit $2

     else

         echo -e "Error: $1"

-        exit $2

     fi

+    

+    exit $2

 }

@@ -86,6 +94,17 @@ function warning {

 }

+# Info message

+function info {

+    if [[ -t 1 ]]

+    then

+        echo -e "\e[32mInfo:\e[00m $1"

+    else

+        echo -e "Info: $1"

+    fi

+}

+

+

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

 # Dependencies #

@@ -128,7 +147,7 @@ tmp_list="/tmp/$(basename $list)-$mydate"

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

 # Check file list

-if [[ $(awk -F ";" "END {print NF}" "$list") != 2 ]]

+if [[ $(awk -F ";" "END {print NF}" "$list") -gt 3 ]]

 then

     error "The list file "$list" is malformated. Each path pair must be on unique line and each path must be semi-colon (';') separated." 1

 fi

@@ -136,6 +155,7 @@ fi

 # Remove comments from list file

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

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

 # Synchronization

@@ -145,17 +165,22 @@ 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/ *$//")

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

-    # Check if destination file exists

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

+

+    # Check if mydst variable is empty or contain directory

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

     then

-        warning "${mydst##*/}: Local file does not exist. Skipping..."

+        warning "The destination name is absent. Skipping..."

         continue

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

+    then

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

+        mkdir "${mydst%/*}"

     fi

-

     # Check if remote path is http

     if [[ ! $(echo "$mysrc" | grep -i "^http") ]]

     then

@@ -171,6 +196,16 @@ do

     then

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

         continue

+    # Check if destination file exists

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

+    then

+        if [[ $dry == 1 ]]

+        then

+            info "${mydst##*/}: file available but not installed."

+        else

+            mv "$mydst_tmp" "$mydst"

+            info "${mydst##*/} installed."

+        fi

     else

         # Compare downloaded file and destination file (update file if need)

         mydst_tmp_md=$(md5sum "$mydst_tmp" | cut -d " " -f 1)

@@ -179,15 +214,25 @@ do

         then

             if [[ $dry == 1 ]]

             then

-                warning "${mydst##*/}: A new version is available."

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

             else

                 mv "$mydst_tmp" "$mydst"

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

             fi

         else

             rm "$mydst_tmp"

         fi

     fi

+    if [[ -z $dry && -n "$mymod" && -n $(echo "$mymod" | sed -n "/[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") ]]

+    then

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

+        continue

+    fi

+

 done < "$tmp_list"

@@ -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

 }

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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 1.1

+# Version: 1.2

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

 # Created in: 2014-09-03

-# Modified in: 2014-09-14

+# Modified in: 2014-09-24

 # Licence: GPL v3

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

 # Versions #

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

+# 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

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

@@ -106,7 +107,7 @@ fi

 # Temporary list

 mydate=$(date +%N)

-tmp_list="/tmp/$list-$mydate"

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

@@ -135,6 +136,14 @@ do

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

+    # Check if destination file exists

+    if [[ ! -e "$mydst" ]]

+    then

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

+        continue

+    fi

+

+

     # Check if remote path is http

     if [[ ! $(echo "$mysrc" | grep -i "^http") ]]

     then

@@ -1,6 +1,6 @@

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 1.0

+# Version: 1.1

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

 # Created in: 2014-09-03

 # Modified in: 2014-09-14

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

 # Versions #

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

+# 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

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

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

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

 # Dependency test

 function test_dep {

-    if [[ ! $(which $1 &> /dev/null) ]]

+    which $1 &> /dev/null

+    if [[ $? != 0 ]]

     then

         error "Package $1 is needed. Exiting..." 1

     fi

@@ -1,10 +1,10 @@

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 0.1

+# Version: 1.0

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

 # Created in: 2014-09-03

-# Modified in: 2014-09-13

-# Licence : GPL v3

+# Modified in: 2014-09-14

+# Licence: GPL v3

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

 # Versions #

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

+# 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

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

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

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

 # Dependency test

 function test_dep {

-    if [[ ! $(which $1) ]]

+    if [[ ! $(which $1 &> /dev/null) ]]

     then

         error "Package $1 is needed. Exiting..." 1

     fi

@@ -47,7 +48,8 @@ Aim: $aim

 Options:

     -l, --list      File containing remote path and local path of a file to synchronize.

                     The list file must have a unique path pair per line and each path must

-                    be semi-colon separated. The remote path must be http path.

+                    be semi-colon separated (path1 ; path2). The remote path must be http path.

+                    Comments beginning by # are allowed anywhere.

     -d, --dry-run   Run the synchronization but print a message instead of updating the files. 

@@ -74,7 +76,7 @@ function warning {

 # Dependencies #

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

-test_dep git

+test_dep wget

@@ -100,6 +102,10 @@ then

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

 fi

+# Temporary list

+mydate=$(date +%N)

+tmp_list="/tmp/$list-$mydate"

+

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

@@ -113,18 +119,29 @@ then

 fi

+# Remove comments from list file

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

+

+

 # Synchronization

 while read line

 do

     # Get paths

-    mysrc=$(echo "$line" | cut -d ";" -f 1)

-    mydst=$(echo "$line" | cut -d ";" -f 2)

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

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

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

+    # Check if remote path is http

+    if [[ ! $(echo "$mysrc" | grep -i "^http") ]]

+    then

+        warning "${mydst##*/}: Remote path is not http address. Skipping..."

+        continue

+    fi

+

     # Download file

-    wget --no-check-certificate -O "$mydst_tmp" "$mysrc"

+    wget --no-check-certificate -O "$mydst_tmp" "$mysrc" &> /dev/null

     # Check for errors

     if [[ $? != 0 ]]

@@ -133,7 +150,9 @@ do

         continue

     else

         # Compare downloaded file and destination file (update file if need)

-        if [[ $(md5sum "$mydst_tmp") -ne $(md5sum "$mydst") ]]

+        mydst_tmp_md=$(md5sum "$mydst_tmp" | cut -d " " -f 1)

+        mydst_md=$(md5sum "$mydst" | cut -d " " -f 1)

+        if [[ "$mydst_tmp_md" != "$mydst_md" ]]

         then

             if [[ $dry == 1 ]]

             then

@@ -146,7 +165,11 @@ do

         fi

     fi

-done < "$list"

+done < "$tmp_list"

+

+

+# Remove temporary list

+rm "$tmp_list"

 exit 0

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

 #!/bin/bash

 # Title: git-sync.sh

-# Version: 0.0

+# Version: 0.1

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

 # Created in: 2014-09-03

-# Modified in:

+# Modified in: 2014-09-13

 # Licence : GPL v3

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

 # Versions #

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

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

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

@@ -39,16 +40,18 @@ function test_dep {

 # Usage message

 function usage {

     echo -e "

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

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

 Aim: $aim

 Options:

-    -l, --list      file containing remote path and local path of a file to synchronize.

+    -l, --list      File containing remote path and local path of a file to synchronize.

                     The list file must have a unique path pair per line and each path must

                     be semi-colon separated. The remote path must be http path.

-    -h, --help      this message

+    -d, --dry-run   Run the synchronization but print a message instead of updating the files. 

+

+    -h, --help      This message

 "

 }

@@ -83,9 +86,10 @@ test_dep git

 while [[ $# -gt 0 ]]

 do

     case $1 in

-        -l|--list   ) list="$2" ; shift 2 ;;

-        -h|--help   ) usage ; exit 0 ;;

-        *           ) error "Invalid option: $1\n$(usage)\n" 1 ;;

+        -l|--list    ) list="$2" ; shift 2 ;;

+        -d|--dry-run ) dry=1 ; shift ;;

+        -h|--help    ) usage ; exit 0 ;;

+        *            ) error "Invalid option: $1\n$(usage)\n" 1 ;;

     esac

 done

@@ -120,18 +124,23 @@ do

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

     # Download file

-    wget -O "$mydst_tmp" "$mysrc"

+    wget --no-check-certificate -O "$mydst_tmp" "$mysrc"

     # Check for errors

     if [[ $? != 0 ]]

     then

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

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

         continue

     else

         # Compare downloaded file and destination file (update file if need)

         if [[ $(md5sum "$mydst_tmp") -ne $(md5sum "$mydst") ]]

         then

-            mv "$mydst_tmp" "$mydst"

+            if [[ $dry == 1 ]]

+            then

+                warning "${mydst##*/}: A new version is available."

+            else

+                mv "$mydst_tmp" "$mydst"

+            fi

         else

             rm "$mydst_tmp"

         fi

new file mode 100755

@@ -0,0 +1,143 @@

+#!/bin/bash

+# Title: git-sync.sh

+# Version: 0.0

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

+# Created in: 2014-09-03

+# Modified in:

+# Licence : GPL v3

+

+

+

+#======#

+# Aims #

+#======#

+

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

+

+

+

+#==========#

+# Versions #

+#==========#

+

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

+

+

+

+#===========#

+# Functions #

+#===========#

+

+# Dependency test

+function test_dep {

+    if [[ ! $(which $1) ]]

+    then

+        error "Package $1 is needed. Exiting..." 1

+    fi

+}

+

+# Usage message

+function usage {

+    echo -e "

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

+

+Aim: $aim

+

+Options:

+    -l, --list      file containing remote path and local path of a file to synchronize.

+                    The list file must have a unique path pair per line and each path must

+                    be semi-colon separated. The remote path must be http path.

+

+    -h, --help      this message

+"

+}

+

+

+# Error message

+function error {

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

+    exit $2

+}

+

+

+# Warning message

+function warning {

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

+}

+

+

+

+#==============#

+# Dependencies #

+#==============#

+

+test_dep git

+

+

+

+#==========================#

+# Declaration of variables #

+#==========================#

+

+# Options

+while [[ $# -gt 0 ]]

+do

+    case $1 in

+        -l|--list   ) list="$2" ; shift 2 ;;

+        -h|--help   ) usage ; exit 0 ;;

+        *           ) error "Invalid option: $1\n$(usage)\n" 1 ;;

+    esac

+done

+

+

+# Check the existence of obligatory options

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

+then

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