summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTodd Naugle <toddn@harrisonconsoles.com>2016-09-02 10:37:37 -0500
committerTodd Naugle <toddn@harrisonconsoles.com>2016-09-02 10:39:23 -0500
commitcbd310ef650c88e61d65defdfc3e785aa9dc7326 (patch)
tree60b76f452e359363fb3030031105b4a6619e2025 /tools
parentd50df82799665e4bbf7c9d8cf2a7c2af866f0da2 (diff)
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.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/linux_packaging/stage2.run.in23
1 files changed, 15 insertions, 8 deletions
diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index 7ec369d180..113e5c64cd 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -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."