DRY principle in overwriting the AADL components.

install/40_ocarina.sh

@@ -2,14 +2,18 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . "${DIR}/common.sh"
 
+function overWriteAADLcomponents()
+{
+    # Install Maxime's customized version of available deployment targets
+    echo Installing customized version of available deployment targets...
+    cat ../misc/supported-platforms/ocarina_components.aadl  | \
+        sed "s,/home/taste/tool-inst,$(taste-config --prefix)," > \
+        "${PREFIX}/share/ocarina/AADLv2/ocarina_components.aadl"
+}
+
 # Setup the tools in ~/.local/bin
 cd "$DIR/../ocarina" || exit 1
 
-# Install Maxime's customized version of available deployment targets
-cat ../misc/supported-platforms/ocarina_components.aadl  | \
-    sed "s,/home/taste/tool-inst,$(taste-config --prefix)," > \
-    ${PREFIX}/share/ocarina/AADLv2/ocarina_components.aadl
-
 # Skip Ocarina building if tree is clean and version is identical
 HEAD="$(git log --oneline | head -1 | cut -d' ' -f1)"
 VERSION_INSTALLED="$(ocarina -v 2>&1 | grep ^Oca | awk '{print $NF}' | sed 's,),,;s,r,,')"
@@ -21,6 +25,7 @@ else
 fi
 if [ ${TREE_DIRTY} -eq 0 ] && [ "${HEAD}" == "${VERSION_INSTALLED}" ] ; then
     echo Ocarina tree is clean and already installed. Skipping Ocarina build...
+    overWriteAADLcomponents
     exit 0
 fi
 
@@ -30,6 +35,8 @@ make distclean # ignore any errors here
 make || exit 1
 make install
 
+overWriteAADLcomponents
+
 # Add Ocarina to PATH
 PATH_CMD='export PATH=$PATH:'"${PREFIX}/bin"
 UpdatePATH