Author: nextgens
Date: 2006-08-26 19:22:03 +0000 (Sat, 26 Aug 2006)
New Revision: 10272
Modified:
trunk/apps/new_installer/res/unix/run.sh
Log:
revert r10248
Modified: trunk/apps/new_installer/res/unix/run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/run.sh 2006-08-26 18:46:07 UTC (rev
10271)
+++ trunk/apps/new_installer/res/unix/run.sh 2006-08-26 19:22:03 UTC (rev
10272)
@@ -179,12 +179,9 @@
# Resolve the architecture
DIST_ARCH=`uname -m | tr [:upper:] [:lower:] | tr -d [:blank:]`
case "$DIST_ARCH" in
- 'amd64' | 'ia64' | 'x86_64')
- DIST_ARCH="x86-64"
+ 'amd64' | 'ia32' | 'ia64' | 'i386' | 'i486' | 'i586' | 'i686' | 'x86_64')
+ DIST_ARCH="x86"
;;
- 'ia32' | 'i386' | 'i486' | 'i586' | 'i686')
- DIST_ARCH="x86-32"
- ;;
'ip27')
DIST_ARCH="mips"
;;
@@ -207,7 +204,7 @@
# platforms, if the 64-bit binary exists then the distribution most
# likely wants to use long names. Otherwise, look for the default.
# For macosx, we also want to look for universal binaries.
-WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH"
+WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
if [ -x $WRAPPER_TEST_CMD ]
then
WRAPPER_CMD="$WRAPPER_TEST_CMD"
