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

 #!/bin/bash

 # Title: git-repo-creator.sh

-# Version: 0.1

+# Version: 0.2

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

 # Created in: 2014-08-31

-# Modified in: 2014-09-01

+# Modified in: 2019-06-02

 # Licence : GPL v3

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

 # Versions #

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

+# v0.2 - 2019-06-02: SSH port option added

 # 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

@@ -40,7 +41,7 @@ function test_dep {

 # Usage message

 function usage {

     echo -e "

-    \e[32m${0##*/}\e[00m -r|--rep repository_name -d|--drep remote_repository_name -s|--svr server_name -u|--usr user_name -h|--help

+    \e[32m${0##*/}\e[00m -r|--rep repository_name -d|--drep remote_repository_name -s|--svr server_name -u|--usr user_name -p|--port ssh_port -h|--help

 Aim: $aim

@@ -49,6 +50,7 @@ Options:

     -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

+    -p, --port      SSH port for server connection [default: 22]

     -h, --help      this message

 "

 }

@@ -88,6 +90,7 @@ do

         -d|--drep   ) drep="$2" ; shift 2 ;;

         -s|--svr    ) svr="$2" ; shift 2 ;;

         -u|--usr    ) usr="$2" ; shift 2 ;;

+        -p|--port   ) port="$2" ; shift 2 ;;

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

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

     esac

@@ -119,6 +122,15 @@ then

     drep="$rep"

 fi

+# Set default value for SSH port

+if [[ -n "$port" && $(echo "$port" | egrep -x -v "[[:digit:]]+") ]]

+then

+    error "The option -p must be numeric only. Exiting...\n$(usage)\n" 1

+elif [[ -z $port ]]

+then

+    port=22

+fi

+

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

@@ -131,14 +143,14 @@ if [[ -n "$drep" ]]

 then

     # Test of the ssh connection

-    ssh -q "$usr"@"$svr" "echo 2>&1" &> /dev/null

+    ssh -p $port -q "$usr"@"$svr" "echo 2>&1" &> /dev/null

     if [[ $? != 0 ]]

     then

         error "Unable to connect to the server $svr. Aborting..." 1

     fi

     # Test of the existance of the distant directory

-    ssh -q "$usr"@"$svr" "ls $drep" &> /dev/null

+    ssh -p $port -q "$usr"@"$svr" "ls $drep" &> /dev/null

     if [[ $? == 0 ]]

     then

         warning "Remote directory exists already on the server."

@@ -158,7 +170,7 @@ then

         # Upload of the structure on the server

         old_pwd="$PWD"

         cd /tmp

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

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

         cd "$old_pwd"

         # Removing of the tmp files

@@ -204,11 +216,11 @@ then

             echo "Skipping..."

         else

             git remote remove origin

-            git remote origin "$usr@$svr:$drep"

+            git remote origin "ssh://$usr@$svr:$port/~/$drep"

         fi

    else

-       git remote add origin "$usr@$svr:$drep"

+       git remote add origin "ssh://$usr@$svr:$port/~/$drep"

    fi

 fi