second chance with-3

kgyrtkirk · Mar 24, 2021 · 447f142 · 447f142
1 parent f0c95ad
commit 447f142
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/scripts/cdpd-patcher b/src/main/scripts/cdpd-patcher
@@ -42,7 +42,7 @@ patch_url="`cat $tmp | jq -r .centos7.patch_url`"
 wget -nv -O $tmp "${patch_url}/${COMPONENT}-source.patch" ||
 wget -nv -O $tmp "${patch_url}/dag_build/${COMPONENT}-source.patch"
 
-git apply -p1 -C0 $tmp
+git apply -p1 -C0 $tmp || git apply -3 -p1 -C0 $tmp
 if [[ "$build" < "7.2.1" ]];then
 	sed -i "s/pig.version>0.16.0.*</pig.version>0.16.0.${build}</" pom.xml
 else

diff --git a/src/main/scripts/look_for_class b/src/main/scripts/look_for_class
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+
+[ "$#" -lt 2 ] && echo -e "usage:\n $0 <dir> <classNamePattern>" && exit 1
+
+
+function candidateJars() {
+	[ ! -d "$1" ] && echo "$1 is not a dir" >&2 && exit 1
+#	find "$1" -name "hive*jar" >&2
+	find "$1" -name "hive*jar"
+}
+
+DIR="$1"
+PAT="$2"
+candidateJars "$DIR" | xargs -n1 unzip -t | fgrep -f <(echo Archive:;echo "$PAT") | grep -B1 "$PAT"