diff options
| author |   Sam James <sam@gentoo.org> | 2022-12-10 03:38:45 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-12-10 03:38:45 +0000 |
| commit | e052612e596c880aec754855e80ee9ffb501ab98 (patch) | |
| tree | 98a74043450e8e75f24e6f9b501ded6dffdcc30c /dev-java/asm | |
| parent | sys-apps/portage: use bash tests (diff) | |
| download | gentoo-e052612e596c880aec754855e80ee9ffb501ab98.tar.gz gentoo-e052612e596c880aec754855e80ee9ffb501ab98.tar.bz2 gentoo-e052612e596c880aec754855e80ee9ffb501ab98.zip | |
dev-java/asm: tweak variable style
QA policy says we do ${foo}, not $foo, so tweak.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-java/asm')
| -rw-r--r-- | dev-java/asm/asm-5.1-r1.ebuild | 1 | ||||
| -rw-r--r-- | dev-java/asm/asm-9.3.ebuild | 16 | ||||
| -rw-r--r-- | dev-java/asm/asm-9.4.ebuild | 16 |
3 files changed, 17 insertions, 16 deletions
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild index c4beac9c0ac2..1caebff74cf0 100644 --- a/dev-java/asm/asm-5.1-r1.ebuild +++ b/dev-java/asm/asm-5.1-r1.ebuild @@ -39,6 +39,7 @@ src_prepare() { } src_install() { + local x for x in output/dist/lib/*.jar ; do java-pkg_newjar "${x}" $(basename "${x%-*}.jar") done diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild index 08fac0e70b42..6777ac94ec5f 100644 --- a/dev-java/asm/asm-9.3.ebuild +++ b/dev-java/asm/asm-9.3.ebuild @@ -29,14 +29,14 @@ src_compile() { einfo "Compiling ${module}" JAVA_RESOURCE_DIRS=() JAVA_MAIN_CLASS="" - JAVA_SRC_DIR="$module/src/main/java" - JAVA_JAR_FILENAME="$module.jar" + JAVA_SRC_DIR="${module}/src/main/java" + JAVA_JAR_FILENAME="${module}.jar" # Not all of the modules have resources. - if [[ -d $module/src/main/resources ]]; then \ - JAVA_RESOURCE_DIRS="$module/src/main/resources" + if [[ -d ${module}/src/main/resources ]]; then \ + JAVA_RESOURCE_DIRS="${module}/src/main/resources" fi java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" rm -r target || die done @@ -44,7 +44,7 @@ src_compile() { JAVA_SRC_DIR=() JAVA_JAR_FILENAME="ignoreme.jar" for module in "${ASM_MODULES[@]}"; do - JAVA_SRC_DIR+=( "$module/src/main/java" ) + JAVA_SRC_DIR+=( "${module}/src/main/java" ) done java-pkg-simple_src_compile fi @@ -54,9 +54,9 @@ src_install() { einstalldocs # https://bugs.gentoo.org/789582 local module for module in "${ASM_MODULES[@]}"; do - java-pkg_dojar $module.jar + java-pkg_dojar ${module}.jar if use source; then - java-pkg_dosrc "$module/src/main/java/*" + java-pkg_dosrc "${module}/src/main/java/*" fi done if use doc; then diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild index 872b14d0208c..a53653b4d749 100644 --- a/dev-java/asm/asm-9.4.ebuild +++ b/dev-java/asm/asm-9.4.ebuild @@ -55,11 +55,11 @@ src_prepare() { src_compile() { local module for module in "${ASM_MODULES[@]}"; do - einfo "Compiling $module" - JAVA_JAR_FILENAME="$module.jar" - JAVA_SRC_DIR="$module/src/main/java" + einfo "Compiling ${module}" + JAVA_JAR_FILENAME="${module}.jar" + JAVA_SRC_DIR="${module}/src/main/java" java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" rm -r target || die done @@ -68,8 +68,8 @@ src_compile() { JAVA_JAR_FILENAME="ignoreme.jar" JAVA_SRC_DIR=() for module in "${ASM_MODULES[@]}"; do - rm "$module/src/main/java/module-info.java" || die - JAVA_SRC_DIR+=("$module/src/main/java") + rm "${module}/src/main/java/module-info.java" || die + JAVA_SRC_DIR+=("${module}/src/main/java") done java-pkg-simple_src_compile fi @@ -78,9 +78,9 @@ src_compile() { src_install() { local module for module in "${ASM_MODULES[@]}"; do - java-pkg_dojar $module.jar + java-pkg_dojar ${module}.jar if use source; then - java-pkg_dosrc "$module/src/main/java/*" + java-pkg_dosrc "${module}/src/main/java/*" fi done if use doc; then |