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

 #!/bin/bash

 # Title: git-repo-creator.sh

-# Version: 0.0

+# Version: 0.1

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

 # Created in: 2014-08-31

-# Modified in:

+# Modified in: 2014-09-01

 # Licence : GPL v3

@@ -20,7 +20,8 @@ aim="Create a git repository locally and remotely on a given server using ssh."

 # Versions #

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

-# v0.0: creation

+# v0.1 - 2014-09-01: default value for -d using structure of -r added / if remote repository exist, skip instead of interrupt the script / addition of missing part of initialisation step when done for the first time / bug correction in the reinitialisation of remote path

+# v0.0 - 2014-08-31: creation

@@ -45,7 +46,7 @@ Aim: $aim

 Options:

     -r, --rep       name or path of the repository created locally

-    -d, --drep      name or path of the repository created on the server

+    -d, --drep      name or path of the repository created on the server [default: value of -r]

     -s, --svr       name of the server

     -u, --usr       user name for server connection

     -h, --help      this message

@@ -66,6 +67,7 @@ function warning {

 }

+

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

 # Dependencies #

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

@@ -98,10 +100,23 @@ then

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

 fi

+# Check variable value for remote repository

 if [[ -n "$drep" ]]

 then

     [[ -z "$svr" ]] && error "Server destination missing. Exiting...\n$(usage)\n" 1

     [[ -z "$usr" ]] && error "Server user missing. Exiting...\n$(usage)\n" 1

+elif [[ -n "$svr" ]]

+then

+    [[ -z "$usr" ]] && error "Server user missing. Exiting...\n$(usage)\n" 1

+elif [[ -n "$usr" ]]

+then

+    [[ -z "$svr" ]] && error "Server destination missing. Exiting...\n$(usage)\n" 1

+fi

+

+# Set default value for remote repository

+if [[ -n "$usr" && -n "$svr" && -z "$drep" ]]

+then

+    drep="$rep"

 fi

@@ -127,28 +142,32 @@ then

     if [[ $? == 0 ]]

     then

         warning "Remote directory exists already on the server."

-        read -p "Continue? [y/N] " answer

-        if [[ -z "$answer" || "$answer" =~ [NO]|[no] ]]

+        read -p "Skipping? [Y/n] " answer

+        if [[ -z "$answer" || "$answer" =~ [YES]|[yes] ]]

         then

-            echo "Aborting..."

-            exit 1

+            echo "Skipping..."

+            skip_flag=1

         fi

     fi

+    

+    if [[ -z $skip_flag ]]

+    then

+        # Creation of the local sturcture in /tmp

+        git --bare init "/tmp/$drep" &> /dev/null

-    # Creation of the local sturcture in /tmp

-    git --bare init "/tmp/$drep" &> /dev/null

-

-    # Upload of the structure on the server

-    old_pwd="$PWD"

-    cd /tmp

-    scp -p -r "${drep%%/*}" $usr@$svr: &> /dev/null

-    cd "$old_pwd"

+        # Upload of the structure on the server

+        old_pwd="$PWD"

+        cd /tmp

+        scp -p -r "${drep%%/*}" $usr@$svr: &> /dev/null

+        cd "$old_pwd"

-    # Removing of the tmp files

-    rm -R "/tmp/$drep"

+        # Removing of the tmp files

+        rm -R "/tmp/$drep"

+    fi

 fi

-# Creation of the directory

+

+# Creation of the local directory

 echo -e "Setting local repository up..."

 mkdir -p "$rep" 2> /dev/null

@@ -163,16 +182,19 @@ then

     then

         echo "Skipping..."

     else

-        git init "$rep"

+        git init

     fi

+else

+    git init

 fi

+

 # Adding remote destination

 if [[ -n "$drep" ]]

 then

     echo -e "Adding remote destination in the local repository..."

-    if [[ $(git remote &> /dev/null; echo $?) == 0 ]]

+    if [[ $(git remote | wc -l) -gt 0 ]]

     then

         warning "Remote destination has already been set up for this repository."

         read -p "Reinitialisation? [y/N] " answer