Skip to content

Commit

Permalink
Fix USER_CUSTOM_PACKAGES_DIR (#67) (#69)
Browse files Browse the repository at this point in the history
* added microros_component/extra_packages support

* added microros_component/extra_packages_support

* copy only if usr pkgs exist

* changes requested by @pablogs9

* Update library_generation.sh

* Update library_generation.sh

(cherry picked from commit 80b3417)

Co-authored-by: Harsh Davda <[email protected]>
  • Loading branch information
mergify[bot] and Aetherbase authored Jun 16, 2022
1 parent 8168e3f commit f0b64af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pushd firmware/mcu_ws > /dev/null
# Import user defined packages
mkdir extra_packages
pushd extra_packages > /dev/null
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../microros_component/extra_packages
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../../microros_component/extra_packages
if [ -d "$USER_CUSTOM_PACKAGES_DIR" ]; then
cp -R $USER_CUSTOM_PACKAGES_DIR/* .
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pushd firmware/mcu_ws > /dev/null
# Import user defined packages
mkdir extra_packages
pushd extra_packages > /dev/null
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../microros_component/extra_packages
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../../microros_component/extra_packages
if [ -d "$USER_CUSTOM_PACKAGES_DIR" ]; then
cp -R $USER_CUSTOM_PACKAGES_DIR/* .
fi
Expand Down

0 comments on commit f0b64af

Please sign in to comment.