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