File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed
jlink/artifacts/opt/jboss/container/java/jlink
s2i/bash/artifacts/usr/local/s2i Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set -euo pipefail
4
4
function mkstrippeddeps() {
5
5
if [ -f " $S2I_JLINK_TEMP_PATH /deps.txt" ]; then
6
6
echo " deps exists, filtering"
7
- < deps.txt \
7
+ < $S2I_JLINK_TEMP_PATH / deps.txt \
8
8
grep ' java\|jdk\.' | # mostly removes target/, but also jdk8internals
9
9
sed -E " s/Warning: .*//" | # remove extraneous warnings
10
10
sed -E " s/.*-> //" | # remove src of src -> dep
Original file line number Diff line number Diff line change @@ -58,11 +58,11 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then
58
58
exit 1
59
59
}
60
60
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
61
67
fi
62
68
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
You can’t perform that action at this time.
0 commit comments