Merge branch 'fix_wolf_scripts_issue_151' into 'master'

Solve issue 151: Fix wolf scripts

See merge request mobile_robotics/wolf!184

wolf_scripts/generic_func/functions.sh

@@ -12,7 +12,7 @@ NC=$(tput sgr 0) # No Color
 
 askIfGitBranch()
 {
- read -p "${CYAN}Do you want to create a new git branch(Y/n)?  ${NC}" ANSWER
+ read -p "${CYAN}Do you want to create a new git branch (y/n)?  ${NC}" ANSWER
  DOIT=${ANSWER:-y}
  OK=0
  

wolf_scripts/generic_func/user_menu.sh

@@ -92,3 +92,8 @@ if ! [[ $BASE =~ $TYPE ]] ;
 then
     BASE="$TYPE"_"$BASE";
 fi
+
+if ! [[ $CLASSNAME =~ .*BASE*. ]] ;
+then
+	CLASSNAME=${CLASSNAME//Base}  # Replace Base with nothing
+fi