|
5 | 5 |
|
6 | 6 | set -e
|
7 | 7 |
|
| 8 | +get_canonical_username="$(dirname "${BASH_SOURCE[0]}")/get_canonical_username.sh" |
| 9 | + |
8 | 10 | usage()
|
9 | 11 | {
|
10 | 12 | echo "Usage $(basename $0) maintainers_file manifest_path"
|
@@ -96,19 +98,23 @@ for module_maintainer_entry in "${module_maintainer_entries[@]}"; do
|
96 | 98 |
|
97 | 99 | ## Write maintainer entries
|
98 | 100 | for maintainer in ${maintainers}; do
|
99 |
| - if [[ " ${global_admins[@]} " =~ " ${maintainer} " ]]; then |
100 |
| - echo "user,${maintainer},admin" >> ${collab_list_file} |
| 101 | + username=$(${get_canonical_username} ${maintainer}) |
| 102 | + |
| 103 | + if [[ " ${global_admins[@]} " =~ " ${username} " ]]; then |
| 104 | + echo "user,${username},admin" >> ${collab_list_file} |
101 | 105 | else
|
102 |
| - echo "user,${maintainer},maintain" >> ${collab_list_file} |
| 106 | + echo "user,${username},maintain" >> ${collab_list_file} |
103 | 107 | fi
|
104 | 108 | done
|
105 | 109 |
|
106 | 110 | ## Write collaborator entries
|
107 | 111 | for collaborator in ${collaborators}; do
|
108 |
| - if [[ " ${global_admins[@]} " =~ " ${collaborator} " ]]; then |
109 |
| - echo "user,${collaborator},admin" >> ${collab_list_file} |
| 112 | + username=$(${get_canonical_username} ${collaborator}) |
| 113 | + |
| 114 | + if [[ " ${global_admins[@]} " =~ " ${username} " ]]; then |
| 115 | + echo "user,${username},admin" >> ${collab_list_file} |
110 | 116 | else
|
111 |
| - echo "user,${collaborator},push" >> ${collab_list_file} |
| 117 | + echo "user,${username},push" >> ${collab_list_file} |
112 | 118 | fi
|
113 | 119 | done
|
114 | 120 | done
|
0 commit comments