Merge branch 'f37' into f36
This commit is contained in:
commit
05120c1840
@ -63,18 +63,18 @@ if [ "x$BOOT_JDK" = "x" ] ; then
|
|||||||
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
||||||
echo -n "Checking for ${BOOT_JDK}...";
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||||
echo "Boot JDK found at ${BOOT_JDK}";
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
else
|
else
|
||||||
echo "Not found";
|
echo "Not found";
|
||||||
PREV_VER=$((${MAJOR_VER} - 1));
|
PREV_VER=$((${MAJOR_VER} - 1));
|
||||||
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
||||||
echo -n "Checking for ${BOOT_JDK}...";
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||||
echo "Boot JDK found at ${BOOT_JDK}";
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
else
|
else
|
||||||
echo "Not found";
|
echo "Not found";
|
||||||
exit 4;
|
exit 4;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Boot JDK: ${BOOT_JDK}";
|
echo "Boot JDK: ${BOOT_JDK}";
|
||||||
@ -143,7 +143,7 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
|
|
||||||
# Remove commit checks
|
# Remove commit checks
|
||||||
echo "Removing $(find openjdk -name '.jcheck' -print)"
|
echo "Removing $(find openjdk -name '.jcheck' -print)"
|
||||||
find openjdk -name '.jcheck' -print0 | xargs -0 rm -r
|
find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
|
||||||
|
|
||||||
# Remove history and GHA
|
# Remove history and GHA
|
||||||
echo "find openjdk -name '.hgtags'"
|
echo "find openjdk -name '.hgtags'"
|
||||||
@ -165,7 +165,8 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
else
|
else
|
||||||
SWITCH=czf
|
SWITCH=czf
|
||||||
fi
|
fi
|
||||||
tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
|
TARBALL_NAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
||||||
mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
|
tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
|
||||||
|
mv ${TARBALL_NAME} ..
|
||||||
popd
|
popd
|
||||||
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
||||||
|
Loading…
Reference in New Issue
Block a user