Skip to content

Commit b9612ba

Browse files
committed
- Remove dead search code from rush list
1 parent e10e5f7 commit b9612ba

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

rush

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,9 +1098,8 @@ list_display_item() {
10981098
# src/lib/list_show_repo.sh
10991099
list_show_repo() {
11001100
local repo_or_package="$1"
1101-
local search="$2"
1102-
local simple="$3"
1103-
local all="$4"
1101+
local simple="$2"
1102+
local all="$3"
11041103
local repo="$repo_or_package"
11051104
local package glob repo_path infofile regex package_name
11061105

@@ -1138,11 +1137,7 @@ list_show_repo() {
11381137

11391138
else
11401139
for infofile in "${glob[@]}"; do
1141-
if [[ $search ]]; then
1142-
regex="$repo_path/(.*${search}.*)/info"
1143-
else
1144-
regex="$repo_path/(.*)/info"
1145-
fi
1140+
regex="$repo_path/(.*)/info"
11461141

11471142
if [[ $infofile =~ $regex ]]; then
11481143
package_name="${BASH_REMATCH[1]}"
@@ -1830,15 +1825,14 @@ rush_list_command() {
18301825

18311826
# src/commands/list.sh
18321827
repo_or_package=${args[repo_or_package]}
1833-
search=${args[--search]}
18341828
simple=${args[--simple]}
18351829
all=${args[--all]}
18361830

18371831
if [[ $repo_or_package ]]; then
1838-
list_show_repo "$repo_or_package" "$search" "$simple" "$all"
1832+
list_show_repo "$repo_or_package" "$simple" "$all"
18391833
else
18401834
for k in $(config_keys); do
1841-
list_show_repo "$k" "$search" "$simple" "$all"
1835+
list_show_repo "$k" "$simple" "$all"
18421836
done
18431837
fi
18441838

src/commands/list.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
repo_or_package=${args[repo_or_package]}
2-
search=${args[--search]}
32
simple=${args[--simple]}
43
all=${args[--all]}
54

65
if [[ $repo_or_package ]]; then
7-
list_show_repo "$repo_or_package" "$search" "$simple" "$all"
6+
list_show_repo "$repo_or_package" "$simple" "$all"
87
else
98
for k in $(config_keys); do
10-
list_show_repo "$k" "$search" "$simple" "$all"
9+
list_show_repo "$k" "$simple" "$all"
1110
done
1211
fi

src/lib/list_show_repo.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
list_show_repo() {
22
local repo_or_package="$1"
3-
local search="$2"
4-
local simple="$3"
5-
local all="$4"
3+
local simple="$2"
4+
local all="$3"
65
local repo="$repo_or_package"
76
local package glob repo_path infofile regex package_name
87

@@ -40,11 +39,7 @@ list_show_repo() {
4039

4140
else
4241
for infofile in "${glob[@]}"; do
43-
if [[ $search ]]; then
44-
regex="$repo_path/(.*${search}.*)/info"
45-
else
46-
regex="$repo_path/(.*)/info"
47-
fi
42+
regex="$repo_path/(.*)/info"
4843

4944
if [[ $infofile =~ $regex ]]; then
5045
package_name="${BASH_REMATCH[1]}"

0 commit comments

Comments
 (0)