From b804d7de01b7428423392d4ec233a50dc862ac93 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 3 Nov 2012 01:07:08 -0400
Subject: mv absrepo-convert--filter{package,arch}

---
 pbs-absrepo-convert                |  2 +-
 pbs-absrepo-convert--filterarch    | 37 +++++++++++++++++++++++++++++++++++++
 pbs-absrepo-convert--filterpackage | 37 -------------------------------------
 3 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100755 pbs-absrepo-convert--filterarch
 delete mode 100755 pbs-absrepo-convert--filterpackage

diff --git a/pbs-absrepo-convert b/pbs-absrepo-convert
index 417c2da..8e231af 100755
--- a/pbs-absrepo-convert
+++ b/pbs-absrepo-convert
@@ -141,7 +141,7 @@ convert-arch() {
 	git checkout orig
 	git checkout -b "$arch"
 	git filter-branch -f --tree-filter \
-		"pbs-absrepo-convert--filterpackage $arch" "$arch"
+		"pbs-absrepo-convert--filterarch $arch" "$arch"
 
 	sort -u \
 	    < "${PKGDIR}/missing-packages.${arch}.tmp" \
diff --git a/pbs-absrepo-convert--filterarch b/pbs-absrepo-convert--filterarch
new file mode 100755
index 0000000..3118909
--- /dev/null
+++ b/pbs-absrepo-convert--filterarch
@@ -0,0 +1,37 @@
+#!/bin/bash -e
+arch=$1
+
+# generate map of all packages to their treehash
+tree="$(mktemp)"
+if [[ $arch = master ]]; then
+	git ls-tree -d "$GIT_COMMIT" */trunk > "$tree"
+else
+	git ls-tree -d "$GIT_COMMIT" */repos/*-"$arch" */repos/*-any > "$tree"
+fi
+
+# generate map of all packages to their repo
+repos="$(mktemp)"
+find */repos/* -type d -printf '%h/%h\n' | sed -r 's@^([^/]*)/repos/(.*)-[^-]*$@\1 \2@'|sort -u > "$repos"
+
+# clean the working directory
+rm -rf *
+
+# add the packages back in as remotes
+cat "$tree" | while read mode type treehash path; do
+	package="${path%%/*}"
+	repo="$(sed -n "s/^${package} //p" "$repos")"
+	commithash="$(sed -n "s/^${treehash} //p" "${TMPDIR}/packages-${package}.commits")"
+	if [[ -n "$commithash" ]]; then
+		mkdir -p "$repo"
+		git submodule add ./ "${repo}/${package}"
+		(
+			cd "${repo}/${package}"
+			git checkout "${commithash}"
+		)
+	else
+		printf '%s\n' "$package" >> "${TMPDIR}/missing-packages.${arch}.tmp"
+	fi
+done
+
+# clean up
+rm -f "$repos" "$tree"
diff --git a/pbs-absrepo-convert--filterpackage b/pbs-absrepo-convert--filterpackage
deleted file mode 100755
index 3118909..0000000
--- a/pbs-absrepo-convert--filterpackage
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-arch=$1
-
-# generate map of all packages to their treehash
-tree="$(mktemp)"
-if [[ $arch = master ]]; then
-	git ls-tree -d "$GIT_COMMIT" */trunk > "$tree"
-else
-	git ls-tree -d "$GIT_COMMIT" */repos/*-"$arch" */repos/*-any > "$tree"
-fi
-
-# generate map of all packages to their repo
-repos="$(mktemp)"
-find */repos/* -type d -printf '%h/%h\n' | sed -r 's@^([^/]*)/repos/(.*)-[^-]*$@\1 \2@'|sort -u > "$repos"
-
-# clean the working directory
-rm -rf *
-
-# add the packages back in as remotes
-cat "$tree" | while read mode type treehash path; do
-	package="${path%%/*}"
-	repo="$(sed -n "s/^${package} //p" "$repos")"
-	commithash="$(sed -n "s/^${treehash} //p" "${TMPDIR}/packages-${package}.commits")"
-	if [[ -n "$commithash" ]]; then
-		mkdir -p "$repo"
-		git submodule add ./ "${repo}/${package}"
-		(
-			cd "${repo}/${package}"
-			git checkout "${commithash}"
-		)
-	else
-		printf '%s\n' "$package" >> "${TMPDIR}/missing-packages.${arch}.tmp"
-	fi
-done
-
-# clean up
-rm -f "$repos" "$tree"
-- 
cgit v1.1-4-g5e80