| 1 |
commit: 147f237a57b7eea135c53f842d53c51a120d4d8c |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 9 11:21:27 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 9 12:43:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=147f237a |
| 7 |
|
| 8 |
tree.sh: remove both beta and p in _beta1_p1.2.0. |
| 9 |
|
| 10 |
scripts/tree.sh | 48 +++++++++++++++++++++++++++--------------------- |
| 11 |
1 file changed, 27 insertions(+), 21 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/tree.sh b/scripts/tree.sh |
| 14 |
index 3b44481..c44c127 100755 |
| 15 |
--- a/scripts/tree.sh |
| 16 |
+++ b/scripts/tree.sh |
| 17 |
@@ -6,24 +6,8 @@ source /etc/java-ebuilder.conf |
| 18 |
|
| 19 |
mkdir -p "${POMDIR}" |
| 20 |
|
| 21 |
-gebd() { |
| 22 |
- case ${MA} in |
| 23 |
- weld-osgi-bundle) |
| 24 |
- # 1.1.0.Final no longer exist |
| 25 |
- [[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final |
| 26 |
- ;; |
| 27 |
- esac |
| 28 |
- |
| 29 |
- local WORKDIR=${PG//./\/}/${MA} MID |
| 30 |
- local MID=${PG}:${MA}:${MV} |
| 31 |
- local PV=${MV} PA SLOT |
| 32 |
- |
| 33 |
- case ${MA} in |
| 34 |
- opengl-api) |
| 35 |
- [[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1 |
| 36 |
- ;; |
| 37 |
- esac |
| 38 |
- |
| 39 |
+sver() { |
| 40 |
+ PV=$1 |
| 41 |
# com.github.lindenb:jbwa:1.0.0_ppc64 |
| 42 |
PV=${PV/_/.} |
| 43 |
# plexus-container-default 1.0-alpha-9-stable-1 |
| 44 |
@@ -49,14 +33,36 @@ gebd() { |
| 45 |
PV=${PV%.[a-zA-Z]*} |
| 46 |
# com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15 |
| 47 |
# plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1 |
| 48 |
- PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV}) |
| 49 |
+ while [[ ${PV} != ${PV0} ]]; do |
| 50 |
+ PV0=${PV} |
| 51 |
+ PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV0}) |
| 52 |
+ done |
| 53 |
# remove all non-numeric charactors before _ |
| 54 |
# org.scalamacros:quasiquotes_2.10:2.0.0-M8 |
| 55 |
if [[ ${PV} = *_* ]]; then |
| 56 |
- PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} |
| 57 |
+ echo $(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} |
| 58 |
else |
| 59 |
- PV=$(sed 's/[^.0-9]//g' <<< ${PV}) |
| 60 |
+ sed 's/[^.0-9]//g' <<< ${PV} |
| 61 |
fi |
| 62 |
+} |
| 63 |
+ |
| 64 |
+gebd() { |
| 65 |
+ case ${MA} in |
| 66 |
+ weld-osgi-bundle) |
| 67 |
+ # 1.1.0.Final no longer exist |
| 68 |
+ [[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final |
| 69 |
+ ;; |
| 70 |
+ esac |
| 71 |
+ |
| 72 |
+ local WORKDIR=${PG//./\/}/${MA} MID |
| 73 |
+ local MID=${PG}:${MA}:${MV} |
| 74 |
+ local PV=$(sver ${MV}) PA SLOT |
| 75 |
+ |
| 76 |
+ case ${MA} in |
| 77 |
+ opengl-api) |
| 78 |
+ [[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1 |
| 79 |
+ ;; |
| 80 |
+ esac |
| 81 |
|
| 82 |
# spark-launcher_2.11 for scala 2.11 |
| 83 |
eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA}) |
Archives