From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 4 Feb 2018 11:59:58 +0000 (+0100)
Subject: patchwork-apply.sh: handle OpenWrt repository structure
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12b5746af6bcb3872516b834b779518fb24cdf41;p=maintainer-tools.git

patchwork-apply.sh: handle OpenWrt repository structure

Also cope with patch files lacking a file extensions, certain versions
of the Python patchwork client appear to omit it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/patchwork-apply.sh b/patchwork-apply.sh
index 5f29330..a793330 100755
--- a/patchwork-apply.sh
+++ b/patchwork-apply.sh
@@ -20,7 +20,7 @@ fetch() {(
 	mkdir "pwclient.get.$$"
 	cd "pwclient.get.$$"
 	pwclient get "$1"
-	mv *.patch "../$1.patch"
+	mv * "../$1.patch"
 	cd ..
 	rmdir "pwclient.get.$$"
 )}
@@ -99,12 +99,12 @@ format_reply() {
 	esac
 
 	case "$remote_host" in
-		git.lede-project.org)
+		git.lede-project.org|git.openwrt.org)
 			case "$remote_repo" in
-				source.git)
+				source.git|openwrt/openwrt.git)
 					echo "Merged into ${remote_ref##*/} with"
 				;;
-				lede/*/staging.git)
+				lede/*/staging.git|openwrt/staging/*.git)
 					echo "Merged into my staging tree with"
 				;;
 				*)