ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Move check for detected bundle earlier in install process. 

Previously if the bundle being installed did not support the detected
system the user would get an error message about the .size file
being missing.
This commit is contained in:
Todd Naugle 2016-09-02 10:37:37 -05:00
parent d50df82799
commit cbd310ef65
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/linux_packaging/stage2.run.in
View File

@ -251,6 +251,21 @@ else
ABI=
fi
####################################
# Check if bundle is for this system
####################################
if [ ! -e ${PGM_NAME}_${ARCH}${ABI}-*.tar ]; then
echo ""
echo "!!! ERROR !!! Can't locate ${ARCH}${ABI} bundle file."
echo "The installer detected the system as ${ARCH}${ABI}, but this bundle"
echo "does not contain the files needed for that configuration."
echo ""
read -p "Press ENTER to exit installer:" BLAH
exit 1
fi
####################
# Check disk space
####################
@ -360,14 +375,6 @@ echo "Bundle is on ${FILESYSTEM_TYPE} filesystem"
# untar the correct bundle for us to install
echo "Unpacking bundle for $ARCH${ABI}"
if [ ! -e ${PGM_NAME}_${ARCH}${ABI}-*.tar ]; then
echo ""
echo "!!! ERROR !!! Can't locate ${ARCH}${ABI} bundle file."
echo ""
read -p "Press ENTER to exit installer:" BLAH
exit 1
fi
if ! tar -xf ${PGM_NAME}_${ARCH}${ABI}-*.tar; then
echo ""
echo "!!! ERROR !!! Can't unpack ${ARCH}${ABI} bundle file."