Skip to content

Commit ccfa477

Browse files
committed
Address review feedback
1 parent dd54f04 commit ccfa477

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkstrippeddeps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44
function mkstrippeddeps() {
55
if [ -f "$S2I_JLINK_TEMP_PATH/deps.txt" ]; then
66
echo "deps exists, filtering"
7-
<deps.txt \
7+
< $S2I_JLINK_TEMP_PATH/deps.txt \
88
grep 'java\|jdk\.' | # mostly removes target/, but also jdk8internals
99
sed -E "s/Warning: .*//" | #remove extraneous warnings
1010
sed -E "s/.*-> //" | # remove src of src -> dep

modules/s2i/bash/artifacts/usr/local/s2i/assemble

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then
5858
exit 1
5959
}
6060

61+
if [ "$S2I_DELETE_SOURCE" == "true" ]; then
62+
if [ -n "$(find $S2I_JLINK_TEMP_PATH -maxdepth 0 -type d ! -empty 2> /dev/null)" ]; then
63+
log_info "Cleaning up temporary file directory $S2I_JLINK_TEMP_PATH"
64+
rm -rf $S2I_JLINK_TEMP_PATH
65+
fi
66+
fi
6167
fi
6268

63-
if [ "$S2I_DELETE_SOURCE" == "true" ]; then
64-
if [ -n "$(find $S2I_JLINK_TEMP_PATH -maxdepth 0 -type d ! -empty 2> /dev/null)" ]; then
65-
log_info "Cleaning up temporary file directory $S2I_JLINK_TEMP_PATH"
66-
rm -rf $S2I_JLINK_TEMP_PATH
67-
fi
68-
fi

0 commit comments

Comments
 (0)