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