Index: build/build.sh
===================================================================
diff -u -r0f03260041875f56d91a3d5ae696293b36ddc4af -rb44fe21d52244f0c9afa518653711c3ff84eeb8f
--- build/build.sh	(.../build.sh)	(revision 0f03260041875f56d91a3d5ae696293b36ddc4af)
+++ build/build.sh	(.../build.sh)	(revision b44fe21d52244f0c9afa518653711c3ff84eeb8f)
@@ -216,7 +216,7 @@
 
 cd ..
 
-# Open up the status report and parse for the word Faild. This is 
+# Open up the status report and parse for the word Failed. This is
 # for the unit test and integration tests that are executed at another
 # script. The results will be used to mark the build folder as passed or failed
 # NOTE: find for Failed before adding the manual cases since there might be a 
@@ -316,6 +316,31 @@
 	#return back to main folder
 	cd ..
 
+  currentDir=$(pwd)
+  ../scripts/build/alarmMapping ../common/common/ ../application/sources/model/hd/alarm/
+
+  cd ../application
+  # For good measures add email and user name all the time
+  git config --global user.email "dnavaei@diality.com"
+  git config --global user.name  "Dara Navaei"
+  git add sources/model/hd/alarm/MAlarmMapping.cpp
+  git commit -m "Bamboo Commit: Updated MAlarmMapping.cpp"
+  git push origin
+
+  cd $currentDir
+  cp ../scripts/build/AlarmMapping.csv $reportDir
+
+  cd ../scripts/build
+  rm -rf Alarms.xlsx
+  cp -r /media/Denali06Alarms/Alarms.xlsx "$(pwd)"
+
+  git commit -avm "Bamboo Commit: Copied Alarms table from Alarms folder"
+  git push
+  echo "Current Dir $currentDir"
+
+  python3 ./alarmMapping.py Alarms.xlsx  # my address../../application/resources/settings # the cloned ui.config ->/Alarms/Alarms.conf
+  cd "$currentDir"
+
 	./scripts/build/create_update_folder.sh "$REMOTE_DIR"
 
 	# Copy the build logs the remote address regardless of the build results
Index: build/create_update_folder.sh
===================================================================
diff -u -ra74dc152e367ca7bbef7ab4740c95796401a653c -rb44fe21d52244f0c9afa518653711c3ff84eeb8f
--- build/create_update_folder.sh	(.../create_update_folder.sh)	(revision a74dc152e367ca7bbef7ab4740c95796401a653c)
+++ build/create_update_folder.sh	(.../create_update_folder.sh)	(revision b44fe21d52244f0c9afa518653711c3ff84eeb8f)
@@ -54,11 +54,11 @@
 mkdir -p "$FOLDER_DST"/"$CLOUD_SYNC"
 
 # Copy the required folders
-cp -r  "$FOLDER_SRC"/"$FOLDER_SCR"               "$FOLDER_DST"
-cp -r  "$FOLDER_SRC"/"$FOLDER_FNT"               "$FOLDER_DST"
+cp -r  "$FOLDER_SRC"/"$FOLDER_SCR"              "$FOLDER_DST"
+cp -r  "$FOLDER_SRC"/"$FOLDER_FNT"              "$FOLDER_DST"
 # The settings folder is a symbolically linked folder so L is used to copy the contents
 # and not the link
-cp -rL "$FOLDER_SRC"/"$FOLDER_SET"               "$FOLDER_DST"
+cp -rL "$FOLDER_SRC"/"$FOLDER_SET"              "$FOLDER_DST"
 
 #move the setup scrips to the root folder of the usb
 mv "$FOLDER_DST"/"$FOLDER_SCR"/"$SCRIPT_SU1"    "$FOLDER_DST"
Index: build/unittest.sh
===================================================================
diff -u -r8c71c24551327c17cb90fff2afce3e2d7d89bf47 -rb44fe21d52244f0c9afa518653711c3ff84eeb8f
--- build/unittest.sh	(.../unittest.sh)	(revision 8c71c24551327c17cb90fff2afce3e2d7d89bf47)
+++ build/unittest.sh	(.../unittest.sh)	(revision b44fe21d52244f0c9afa518653711c3ff84eeb8f)
@@ -112,34 +112,6 @@
     fi
 }
 
-getAlarmMapping()
-{
-  local currentDir=$(pwd)
-  ../scripts/build/alarmMapping ../common/common/ ../application/sources/model/hd/alarm/
-
-  cd ../application
-  # For good measures add email and user name all the time
-  git config --global user.email "dnavaei@diality.com"
-  git config --global user.name  "Dara Navaei"
-  git add sources/model/hd/alarm/MAlarmMapping.cpp
-  git commit -m "Bamboo Commit: Updated MAlarmMapping.cpp"
-  git push origin
-
-  cd $currentDir
-  cp ../scripts/build/AlarmMapping.csv $reportDir
-
-  cd ../scripts/build
-  rm -rf Alarms.xlsx
-  cp -r /media/Denali06Alarms/Alarms.xlsx "$(pwd)"
-
-  git commit -avm "Bamboo Commit: Copied Alarms table from Alarms folder"
-  git push
-  echo "Current Dir $currentDir"
-
-  python3 ./alarmMapping.py Alarms.xlsx ../../application/resources/settings/Alarms/Alarms.conf
-  cd "$currentDir"
-}
-
 function make_Directories() {
     echo " ------------------------------ Create the Report output/log folder"
     mkdir -p $LOG_PATH