diff --git a/assets/patches/autoconfig.patch b/assets/patches/autoconfig.patch new file mode 100644 index 0000000..d1c197e --- /dev/null +++ b/assets/patches/autoconfig.patch @@ -0,0 +1,49 @@ +diff --git a/clover/launch/aruco.launch b/clover/launch/aruco.launch +index c4ce578..5f3be12 100644 +--- a/clover/launch/aruco.launch ++++ b/clover/launch/aruco.launch +@@ -1,7 +1,7 @@ + + +- +- ++ ++ + + + +@@ -24,7 +24,7 @@ + + + +- ++ + + + +diff --git a/clover/launch/clover.launch b/clover/launch/clover.launch +index e1bd714..6bf140c 100644 +--- a/clover/launch/clover.launch ++++ b/clover/launch/clover.launch +@@ -7,7 +7,7 @@ + + + +- ++ + + + +diff --git a/clover_simulation/launch/simulator.launch b/clover_simulation/launch/simulator.launch +index d70f5f6..e610c53 100644 +--- a/clover_simulation/launch/simulator.launch ++++ b/clover_simulation/launch/simulator.launch +@@ -13,7 +13,7 @@ + + + +- ++ + + + diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index a1ccbf4..4ad0c44 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -84,6 +84,10 @@ ARUCO_MAP_PATH=${CLOVER_BASE_PATH}/aruco_pose/map WORLD_PATH=${CLOVER_BASE_PATH}/clover_simulation/resources/worlds rosrun clover_simulation aruco_gen --offset-z=0.01 --single-model --source-world=${WORLD_PATH}/clover.world ${ARUCO_MAP_PATH}/cmit.txt > ${WORLD_PATH}/clover_aruco.world +echo "--- Applying configuration patches" +cd ${HOME}/catkin_ws/src/clover +patch -p1 < /tmp/patches/autoconfig.patch + echo "--- Installing npm" cd ${HOME} wget --progress=dot:giga https://nodejs.org/dist/v10.15.0/node-v10.15.0-linux-x64.tar.gz