diff --git a/utils/modules/create-service.sh b/utils/modules/create-service.sh index fc40600107b8bbb04fcb9218040bc9b59e1769f8..8c52a9bbc8494f9cefdaa5489088627968b62433 100755 --- a/utils/modules/create-service.sh +++ b/utils/modules/create-service.sh @@ -46,7 +46,7 @@ else mkdir -p $mainDir/queries fi -echo $modelHtml > $mainDir/queries/main.query -echo $viewHtml > $mainDir/html.template +echo -e "$modelHtml" > $mainDir/queries/main.query +echo -e "$viewHtml" > $mainDir/html.template echo $initToken.$1 created/modified successfully! >&2 diff --git a/utils/modules/create-type.sh b/utils/modules/create-type.sh index 4e1b37708f490f0c71a98f182a178a7701edec7a..379e2fe048ca3880addab878db4180274e1bc42f 100755 --- a/utils/modules/create-type.sh +++ b/utils/modules/create-type.sh @@ -81,7 +81,8 @@ viewHtml=`cat <<VIEW <br/> </body> -</html>VIEW` +</html> +VIEW` #Check models @@ -94,8 +95,8 @@ else mkdir -p $mainDir/queries fi -echo "$modelHtmlSP" > $mainDir/queries/sp.query -echo "$modelHtmlPO" > $mainDir/queries/po.query -echo "$viewHtml" > $mainDir/html.template +echo -e "$modelHtmlSP" > $mainDir/queries/sp.query +echo -e "$modelHtmlPO" > $mainDir/queries/po.query +echo -e "$viewHtml" > $mainDir/html.template echo $1 created successfully! >&2 diff --git a/utils/modules/create-uri.sh b/utils/modules/create-uri.sh index f14405f3ad012b994094a41a6aedc0bfff94fce8..cb916463a6f6d75de9a47425307f1824da941d43 100755 --- a/utils/modules/create-uri.sh +++ b/utils/modules/create-uri.sh @@ -98,8 +98,8 @@ fi #Create file structure mkdir $mainDir/queries -echo "$modelHtmlSP" > $mainDir/queries/sp.query -echo "$modelHtmlPO" > $mainDir/queries/po.query -echo "$viewHtml" > $mainDir/html.template +echo -e "$modelHtmlSP" > $mainDir/queries/sp.query +echo -e "$modelHtmlPO" > $mainDir/queries/po.query +echo -e "$viewHtml" > $mainDir/html.template echo $initToken.$1 created/modified successfully! >&2 diff --git a/utils/modules/delete-type.sh b/utils/modules/delete-type.sh index c934f7e7e41c6c403d48b3a819046409005e09e5..9cddaf897898a3b5d7eb095244fc5ee679da786f 100755 --- a/utils/modules/delete-type.sh +++ b/utils/modules/delete-type.sh @@ -2,67 +2,19 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -initToken='type' +initToken='types' #Check models -mainModelDir=$DIR/../../models/$initToken.$1 -mainViewDir=$DIR/../../views/$initToken.$1 +mainDir=$DIR/../../components/$initToken/$1 -if [ ! -e "$mainModelDir" ] +if [ ! -e "$mainDir" ] then - echo "ERROR: $initToken.$1 doesn't exist in models. Operation aborted" >&2 + echo "ERROR: $initToken/$1 doesn't exist in models. Operation aborted" >&2 exit 1 fi -obj=( ) -if [ "$2" == "all" ] -then - rm -rf $mainModelDir - rm -rf $mainViewDir - echo $initToken.$1 deleted >&2 - exit -else - obj=( $2 ) -fi - -for i in ${obj[@]} -do - if [ ! -e $mainModelDir/$i.queries ] - then - echo "WARNING: $initToken.$1/$i.query does not exists in models." >&2 - fi -done - - -#Check views - -if [ ! -e "$mainViewDir" ] -then - echo "ERROR: $initToken.$1 doesn't exist in views. Operation aborted." >&2 -fi - - -for i in ${obj[@]} -do - if [ ! -e $mainViewDir/$i.template ] - then - echo "WARNING: $mainViewDir/$i.template doesn't exist in views." >&2 - fi -done - - #Delete file structure -if [ "$2" == "all" ] -then - rm -rf $mainModelDir - rm -rf $mainViewDir -else - for i in ${obj[@]} - do - rm -rf $mainModelDir/$i.queries - rm -rf $mainViewDir/$i.template - done -fi +rm -rf $mainDir echo $initToken.$1 deleted successfully! >&2