Skip to content

Commit c4a0560

Browse files
committed
- Fix rush list -s to not show empty repos
1 parent 685d778 commit c4a0560

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

rush

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,15 @@ inspect_args() {
800800
else
801801
echo args: none
802802
fi
803+
804+
if (( ${#other_args[@]} )); then
805+
echo
806+
echo other_args:
807+
echo "- \${other_args[*]} = ${other_args[*]}"
808+
for i in "${!other_args[@]}"; do
809+
echo "- \${other_args[$i]} = ${other_args[$i]}"
810+
done
811+
fi
803812
}
804813

805814
# :command.user_lib
@@ -1397,6 +1406,7 @@ rush_list_command() {
13971406
list_show_repo() {
13981407
local repo_or_package="$1"
13991408
local search="${args[--search]}"
1409+
local simple=${args[--simple]}
14001410
local repo="$repo_or_package"
14011411
local package glob repo_path infofile regex package_name
14021412

@@ -1423,7 +1433,7 @@ rush_list_command() {
14231433
infofile="$repo_path/$package/info"
14241434
if [[ -f "$infofile" ]]; then
14251435
list_display_item "$package" "$infofile" "$repo"
1426-
else
1436+
elif [[ ! $simple ]]; then
14271437
red "nothing in $repo trpo"
14281438
fi
14291439

@@ -1695,6 +1705,7 @@ parse_requirements() {
16951705
shift $#
16961706
;;
16971707

1708+
# :command.command_fallback
16981709
"" )
16991710
rush_usage
17001711
exit 1
@@ -2725,6 +2736,7 @@ initialize() {
27252736
# :command.run
27262737
run() {
27272738
declare -A args
2739+
declare -a other_args
27282740
parse_requirements "$@"
27292741

27302742
if [[ $action == "add" ]]; then

src/list_command.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ list_display_item() {
1919
list_show_repo() {
2020
local repo_or_package="$1"
2121
local search="${args[--search]}"
22+
local simple=${args[--simple]}
2223
local repo="$repo_or_package"
2324
local package glob repo_path infofile regex package_name
2425

@@ -45,7 +46,7 @@ list_show_repo() {
4546
infofile="$repo_path/$package/info"
4647
if [[ -f "$infofile" ]]; then
4748
list_display_item "$package" "$infofile" "$repo"
48-
else
49+
elif [[ ! $simple ]]; then
4950
red "nothing in $repo trpo"
5051
fi
5152

0 commit comments

Comments
 (0)