Ticket #45: lib64.patch

File lib64.patch, 2.1 kB (added by Jan-Nik, 8 months ago)

checks if /usr/lib64 exists; let user continue installation if arch check fails.

  • old/main/share/installer.2.template

    old new  
    3030case "$cpu_architecture" in 
    3131        i386 | i486 | i586 | i686 ) 
    3232                export cpu_architecture="x86";; 
     33        x86_64 ) 
     34                export cpu_architexture="x86_64";; 
    3335esac 
    3436 
    3537if [[ "$cpu_architecture" != "x86" ]]; then 
    36         if [ ! -d /usr/lib32 ]; then 
    37                 errorMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Please install the compatibility libraries and rerun install." "Error Installing Autopackage" 
    38                 rm -rf "$WORKING_DIRECTORY" 
    39                 exit 1 
     38        if [ ! -d /usr/lib32 ] && [ ! -d /usr/lib64 ]; then # If /usr/lib64 exists compat libs are in /usr/lib 
     39                warningMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Installation will continue, but will very likely fail." "Error Installing Autopackage" 
    4040        fi 
    4141fi 
    4242 

  • old/main/share/installer.template

    old new  
    3030case "$cpu_architecture" in 
    3131        i386 | i486 | i586 | i686 ) 
    3232                export cpu_architecture="x86";; 
     33        x86_64 ) 
     34                export cpu_architexture="x86_64";; 
    3335esac 
    3436 
    3537if [[ "$cpu_architecture" != "x86" ]]; then 
    36         if [ ! -d /usr/lib32 ]; then 
    37                 errorMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Please install the compatibility libraries and rerun install." "Error Installing Autopackage" 
    38                 rm -rf "$WORKING_DIRECTORY" 
    39                 exit 1 
     38        if [ ! -d /usr/lib32 ] && [ ! -d /usr/lib64 ]; then # If /usr/lib64 exists compat libs are in /usr/lib 
     39                warningMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Installation will continue, but will very likely fail." "Error Installing Autopackage" 
    4040        fi 
    4141fi