From d357dd51ffe2f509432a1cb38a75118ff5eff90f Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Thu, 18 Jan 2018 18:19:24 +0100
Subject: [PATCH] Added option to specify package prefix instead of iri_
 prefix.

---
 create_algorithm_package.sh | 22 +++++++++++++++-------
 create_driver_package.sh    | 23 +++++++++++++++--------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/create_algorithm_package.sh b/create_algorithm_package.sh
index 2e477ff..630ddc4 100755
--- a/create_algorithm_package.sh
+++ b/create_algorithm_package.sh
@@ -22,21 +22,24 @@ echo "/**********************************************/"
 echo "/* Creating New IRI_ROS Simple Algorithm Node */"
 echo "/**********************************************/"
 
-usage="Usage: create_algorithm_package.sh -n node_name [-i]\n
+usage="Usage: create_algorithm_package.sh -n node_name [-i [other_prefix]]\n
 Parameters:\n
-\t-i: avoid adding the iri_ prefix to the provided node name. By default it is always added."
+\t-i: avoid adding the default iri_ prefix to the provided node name.\n
+\t-i other_prefix: replaces default iri_ prefix with specified other_prefix_."
 input_name=
-use_prefix=true
+use_iri_prefix=true
+input_prefix=
 
 #check for input project name paramenter
-while getopts “:n:i” OPTION
+while getopts “:n:i:” OPTION
 do
   case $OPTION in
     n)
        input_name=$OPTARG
        ;;
     i)
-       use_prefix=false
+       use_iri_prefix=false
+       input_prefix=$OPTARG
        ;;
     ?)
        echo "invalid argument $OPTION"
@@ -56,11 +59,16 @@ fi
 input_name=$(echo ${input_name} | tr "[:upper:]" "[:lower:]")
 
 #create alg filename
-if [[ ${use_prefix} == true ]]
+if [[ ${use_iri_prefix} == true ]]
 then
   project_name="iri_${input_name}"
 else
-  project_name="${input_name}"
+  if [[ ! -z "$input_prefix"  ]]
+  then
+    project_name="${input_prefix}_${input_name}"
+  else
+    project_name="${input_name}"
+  fi
 fi
 
 if [ -e "../${project_name}" ]
diff --git a/create_driver_package.sh b/create_driver_package.sh
index 823902e..27cd1bc 100755
--- a/create_driver_package.sh
+++ b/create_driver_package.sh
@@ -4,7 +4,6 @@
 
 # check wether the scripts path environment variable has been defined
 scripts_path=`echo "${IRI_ROS_SCRIPTS_PATH}"`
-# check if scripts_path has size 0
 if [[ -z "${scripts_path}" ]]
 then
   echo "The scripts path environment variable has not been defined. Please see the wiki documentation for instructions on how to create it."
@@ -23,21 +22,24 @@ echo "/*********************************************/"
 echo "/*     Creating New IRI_ROS Driver Node      */"
 echo "/*********************************************/"
 
-usage="Usage: create_driver_package.sh -n node_name [-i]
+usage="Usage: create_driver_package.sh -n node_name [-i [other_prefix]]
 Parameters:\n
-\t-i: avoid adding the iri_ prefix to the provided node name. By default it is always added."
+\t-i: avoid adding the default iri_ prefix to the provided node name.\n
+\t-i other_prefix: replaces default iri_ prefix with specified other_prefix_."
 input_name=
-use_prefix=true
+use_iri_prefix=true
+input_prefix=
 
 #check for input project name paramenter
-while getopts “:n:i” OPTION
+while getopts “:n:i:” OPTION
 do
   case $OPTION in
     n)
        input_name=$OPTARG
        ;;
     i)
-       use_prefix=false
+       use_iri_prefix=false
+       input_prefix=$OPTARG
        ;;
     ?)
        echo "invalid argument $OPTION"
@@ -57,11 +59,16 @@ fi
 input_name=$(echo ${input_name} | tr "[:upper:]" "[:lower:]")
 
 #create driver filename
-if [[ ${use_prefix} == true ]]
+if [[ ${use_iri_prefix} == true ]]
 then
   project_name="iri_${input_name}"
 else
-  project_name="${input_name}"
+  if [[ ! -z "$input_prefix"  ]]
+  then
+    project_name="${input_prefix}_${input_name}"
+  else
+    project_name="${input_name}"
+  fi
 fi
 
 if [ -e "../${project_name}" ]
-- 
GitLab