Changeset 2425

Timestamp:

12/29/07 16:38:19 (1 year ago)

Author:

taj

Message:

Sat Dec 29 21:33:12 UTC 2007 Taj Morton <tajmorton@gmail.com>

• share/apkg-bashlib: Add errorMessage() function for displaying warnings in a GUI dialog or the
  shell. This function is private until 1.3.
  
• share/installer.[2].template: Tell users they have to install the 32-bit compat libs when attempting to
  install Autopackage on a 64-bit system.
  
• makepackage: Substitute %ErrorMessage?% in installer.[?].template.
  

Files:

• main/trunk/ChangeLog (modified) (1 diff)
• main/trunk/makepackage (modified) (1 diff)
• main/trunk/share/apkg-bashlib (modified) (1 diff)
• main/trunk/share/installer.2.template (modified) (1 diff)
• main/trunk/share/installer.template (modified) (1 diff)

main/trunk/ChangeLog

@@ +1 @@
+Sat Dec 29 21:33:12 UTC 2007  Taj Morton  <tajmorton@gmail.com>
+        * share/apkg-bashlib: Add errorMessage() function for displaying warnings in a GUI dialog or the
+          shell. This function is private until 1.3.
+        * share/installer.[2].template: Tell users they have to install the 32-bit compat libs when attempting to
+          install Autopackage on a 64-bit system.
+        * makepackage: Substitute %ErrorMessage% in installer.[?].template.
+
-Wed Sep  5 01:31:23 UTC 2007  Curtis L. Knight  <knighcl@gmail.com>
-        * release/autopackage-install: Add XDG variables scoped for autopackage.

main/trunk/makepackage

@@ -874 +874 @@
-        installer=`substituteCode "$autopackage_share/apkg-bashlib" "START LOCATECOMMAND" "END LOCATECOMMAND" "$installer" "%LocateCommand%"`
-        installer=`substituteCode "$autopackage_share/apkg-bashlib" "START MESSAGE" "END MESSAGE" "$installer" "%Message%"`
+        installer=`substituteCode "$autopackage_share/apkg-bashlib" "START ERRORMESSAGE" "END ERRORMESSAGE" "$installer" "%ErrorMessage%"`
-
-        downloader=`substituteCode "$autopackage_share/apkg-funclib" "START INSTALLAUTOPACKAGE" "END INSTALLAUTOPACKAGE" "$downloader" "%InstallAutopackage%"`

main/trunk/share/apkg-bashlib

@@ -969 +969 @@
-## END MESSAGE
-
+# Usage: errorMessage <MESSAGE> <TITLE>
+## START ERRORMESSAGE
+## Function is substituted from apkg-bashlib.
+## This function is PRIVATE until 1.3 (because it's new).
+function errorMessage() {
+        if ! tty -s; then
+                # there is no tty
+                if [[ "$DISPLAY" == "" ]] || ! xdpyinfo &>/dev/null; then     # check for X
+                        # we're not in X, so just echo (we might be in a headless script)
+                        echo "$1"
+                else
+                        # we ARE in X, and there is no TTY; started from a gui file manager
+                        if command -v zenity &>/dev/null; then
+                                zenity --error "--text=$1" "--title=$2"
+                        elif command -v gdialog &>/dev/null; then
+                                gdialog --msgbox "$1" 100 100
+                        elif command -v kdialog &>/dev/null; then
+                                kdialog --error "$1" --title "$2"
+                        elif command -v xmessage &>/dev/null; then
+                                xmessage "$1"
+                        else
+                                local DIALOG=
+                                DIALOG=`command -v dialog 2>/dev/null` || DIALOG=`command -v gdialog 2>/dev/null` || DIALOG=`command -v whiptail 2>/dev/null`
+                                if [[ "$DIALOG" != "" ]]; then
+                                        # No graphical dialog; fallback to terminal showing a dialog
+                                        launchInTerminal --title "$2" $DIALOG --msgbox "$1" 17 65
+                                else
+                                        local msg=`escapeFilename "$1"`
+                                        launchInTerminal --title "$2" bash -c "echo $msg; read"
+                                fi
+                        fi
+                fi
+        else
+                # else there is a tty, ie we're in an xterm or the standard console
+                # so just use echo
+                echo "$1"
+        fi
+}
+## END ERRORMESSAGE
+
-
-##

main/trunk/share/installer.2.template

@@ -22 +22 @@
-
-%Message%
+
+%ErrorMessage%
+
+# are we on 32bit (or 64bit + compat libs?)
+locateCommand uname
+cpu_architecture=`"$lc_location" -m`
+case "$cpu_architecture" in
+        i386 | i486 | i586 | i686 )
+                export cpu_architecture="x86";;
+esac
+
+if [[ "$cpu_architecture" != "x86" ]]; then
+        if [ ! -d /usr/lib32 ]; then
+                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"
+                rm -rf "$WORKING_DIRECTORY"
+                exit 1
+        fi
+fi
-
-# setup XDG configuration variables scoped for autopackage

main/trunk/share/installer.template

@@ -22 +22 @@
-
-%Message%
+
+%ErrorMessage%
+
+# are we on 32bit (or 64bit + compat libs?)
+locateCommand uname
+cpu_architecture=`"$lc_location" -m`
+case "$cpu_architecture" in
+        i386 | i486 | i586 | i686 )
+                export cpu_architecture="x86";;
+esac
+
+if [[ "$cpu_architecture" != "x86" ]]; then
+        if [ ! -d /usr/lib32 ]; then
+                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"
+                rm -rf "$WORKING_DIRECTORY"
+                exit 1
+        fi
+fi
-
-# setup XDG configuration variables scoped for autopackage