X Strike Force X.Org X11 SVN commit: r2888 - trunk/xsfbs

[X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>]

Author: dnusinow
Date: 2006-08-21 23:04:13 -0400 (Mon, 21 Aug 2006)
New Revision: 2888

Modified:
   trunk/xsfbs/xsfbs.sh
Log:
Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, and UPGRADE variables

Modified: trunk/xsfbs/xsfbs.sh
===================================================================
--- trunk/xsfbs/xsfbs.sh	2006-08-22 02:31:40 UTC (rev 2887)
+++ trunk/xsfbs/xsfbs.sh	2006-08-22 03:04:13 UTC (rev 2888)
@@ -57,6 +57,29 @@
   exit $SHELL_LIB_USAGE_ERROR
 fi
 
+ARCHITECTURE="$(dpkg --print-installation-architecture)"
+
+LAPTOP=""
+if [ -n "$(which laptop-detect)" ]; then
+    if laptop-detect >/dev/null; then
+	LAPTOP=true
+    fi
+fi
+
+if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+  RECONFIGURE="true"
+else
+  RECONFIGURE=
+fi
+
+if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then
+  FIRSTINST="yes"
+fi
+
+if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then
+  UPGRADE="yes"
+fi
+
 trap "message;\
       message \"Received signal.  Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\
       message;\