Unified tabs and spaces in favor of spaces
This commit is contained in:
parent
75c9dc1ba0
commit
3afaf1a6a1
|
@ -63,23 +63,23 @@ 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}";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
|
# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
|
||||||
if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
|
if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
|
||||||
if [ "x$PROJECT_NAME" = "x" ] ; then
|
if [ "x$PROJECT_NAME" = "x" ] ; then
|
||||||
|
@ -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