ENH: Better output

This commit is contained in:
Andy Cedilnik 2006-05-03 16:24:14 -04:00
parent 00d063a346
commit 96d4a89228
1 changed files with 14 additions and 5 deletions

View File

@ -14,6 +14,12 @@ EOF
exit 1 exit 1
} }
cpack_echo_exit()
{
echo $1
exit 1
}
# Display version # Display version
cpack_version() cpack_version()
{ {
@ -92,13 +98,14 @@ ____cpack__here_doc____
if [ "x${cpack_include_subdir}x" == "xx" ] if [ "x${cpack_include_subdir}x" == "xx" ]
then then
echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:" echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:"
echo " \"${toplevel}\"" echo " \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\""
echo "Do you want to include the subdirectory @CPACK_PACKAGE_FILE_NAME@?" echo "Do you want to include the subdirectory @CPACK_PACKAGE_FILE_NAME@?"
echo "Install in: \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\" [Yn]: " echo "Saying no will install in: \"${toplevel}\" [Yn]: "
read line leftover read line leftover
cpack_include_subdir=TRUE
case ${line} in case ${line} in
y* | Y*) n* | N*)
cpack_include_subdir=TRUE cpack_include_subdir=FALSE
esac esac
fi fi
fi fi
@ -116,7 +123,9 @@ echo ""
# take the archive portion of this file and pipe it to tar # take the archive portion of this file and pipe it to tar
# the NUMERIC parameter in this command should be one more # the NUMERIC parameter in this command should be one more
# than the number of lines in this header file # than the number of lines in this header file
tail -n +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) tail -n +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
echo "Unpacking finished successfully"
exit 0 exit 0
#----------------------------------------------------------- #-----------------------------------------------------------