浏览代码

Use "sort -u" in diff-pr to remove duplicates due to SharedTags

Tianon Gravi 8 年之前
父节点
当前提交
6770ab304a
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      diff-pr.sh

+ 2 - 2
diff-pr.sh

@@ -202,7 +202,7 @@ copy-tar() {
 mkdir temp
 mkdir temp
 git -C temp init --quiet
 git -C temp init --quiet
 
 
-bashbrew list "${images[@]}" | sort -V > temp/_bashbrew-list || :
+bashbrew list "${images[@]}" | sort -uV > temp/_bashbrew-list || :
 bashbrew cat --format "$archesListTemplate" "${images[@]}" | sort -V > temp/_bashbrew-arches || :
 bashbrew cat --format "$archesListTemplate" "${images[@]}" | sort -V > temp/_bashbrew-arches || :
 bashbrew cat --format "$sharedTagsListTemplate" "${images[@]}" | grep -vE '^$' | sort -V > temp/_bashbrew-shared-tags || :
 bashbrew cat --format "$sharedTagsListTemplate" "${images[@]}" | grep -vE '^$' | sort -V > temp/_bashbrew-shared-tags || :
 for image in "${images[@]}"; do
 for image in "${images[@]}"; do
@@ -219,7 +219,7 @@ git -C temp commit --quiet --allow-empty -m 'initial' || :
 git -C oi checkout --quiet pull
 git -C oi checkout --quiet pull
 
 
 git -C temp rm --quiet -rf . || :
 git -C temp rm --quiet -rf . || :
-bashbrew list "${images[@]}" | sort -V > temp/_bashbrew-list || :
+bashbrew list "${images[@]}" | sort -uV > temp/_bashbrew-list || :
 bashbrew cat --format "$archesListTemplate" "${images[@]}" | sort -V > temp/_bashbrew-arches || :
 bashbrew cat --format "$archesListTemplate" "${images[@]}" | sort -V > temp/_bashbrew-arches || :
 bashbrew cat --format "$sharedTagsListTemplate" "${images[@]}" | grep -vE '^$' | sort -V > temp/_bashbrew-shared-tags || :
 bashbrew cat --format "$sharedTagsListTemplate" "${images[@]}" | grep -vE '^$' | sort -V > temp/_bashbrew-shared-tags || :
 script="$(bashbrew cat -f "$template" "${images[@]}")"
 script="$(bashbrew cat -f "$template" "${images[@]}")"