Skip to content

Commit

Permalink
babs.sh rsb and rs command order updates
Browse files Browse the repository at this point in the history
- perform the clean operation first so that the
  verification question whether to cleanup the builddir
  is asked first and not after applying patches first.

Signed-off-by: Mika Laitio <[email protected]>
  • Loading branch information
lamikr committed Jan 30, 2025
1 parent 3929ad5 commit 0517436
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions babs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ func_handle_user_command_args() {
-rs | --reset)
local CUR_DIR=$(pwd)
func_is_git_configured
func_babs_handle_checkout_and_apply_patches ${ARG__USER_CMD_PARAM1} #From babs_handler.sh
cd $CUR_DIR
func_babs_handle_build_direcory_clean ${ARG__USER_CMD_PARAM1} #From repo_management.sh
cd $CUR_DIR
func_babs_handle_checkout_and_apply_patches ${ARG__USER_CMD_PARAM1} #From babs_handler.sh
exit 0
;;
-rb | --rebuild)
Expand All @@ -224,10 +224,10 @@ func_handle_user_command_args() {
-rsb | --reset_build)
local CUR_DIR=$(pwd)
func_is_git_configured
func_babs_handle_checkout_and_apply_patches ${ARG__USER_CMD_PARAM1} #From babs_handler.sh
cd $CUR_DIR
func_babs_handle_build_direcory_clean ${ARG__USER_CMD_PARAM1} #From repo_management.sh
cd $CUR_DIR
func_babs_handle_checkout_and_apply_patches ${ARG__USER_CMD_PARAM1} #From babs_handler.sh
cd $CUR_DIR
func_babs_handle_build ${ARG__USER_CMD_PARAM1} #From babs_handler.sh
exit 0
;;
Expand Down
2 changes: 1 addition & 1 deletion build/build_handler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func_babs_handle_build_direcory_clean() {
fi
res=$?
if [[ $res -eq 0 ]]; then
echo -e "\Build directories cleaned succesfully for all core applications."
echo -e "Build directories cleaned succesfully for all core applications."
echo ""
else
echo -e "Failed to clean build directories for core applications."
Expand Down

0 comments on commit 0517436

Please sign in to comment.