OSSP CVS Repository

ossp - Check-in [5586]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5586
Date: 2005-May-27 11:23:01 (local)
2005-May-27 09:23:01 (UTC)
User:rse
Branch:
Comment: fix AIX detection and output and add Ubuntu Linux to Linux detection
Tickets:
Inspections:
Files:
ossp-pkg/shtool/sh.platform      1.9 -> 1.10     3 inserted, 2 deleted

ossp-pkg/shtool/sh.platform 1.9 -> 1.10

--- sh.platform  2005/05/13 18:52:40     1.9
+++ sh.platform  2005/05/27 09:23:01     1.10
@@ -235,6 +235,7 @@
                         fi
                         ;;
                     debian      ) n="Debian[ GNU/Linux]"        ;;
+                    ubuntu      ) n="Ubuntu[ GNU/Linux]"        ;;
                     fedora      ) n="<Fedora> Core[ GNU/Linux]" ;;
                     suse        ) n="SuSE[ Linux]"              ;;
                     mandrake    ) n="Mandrake[ Linux]"          ;;
@@ -404,7 +405,7 @@
         if [ -x /usr/bin/oslevel ]; then
             os_level=`/usr/bin/oslevel`
         else
-            os_level="`uname -r`.`uname -v`"
+            os_level="`uname -v`.`uname -r`"
         fi
         os_level=`echo "${os_level}" |\
                   sed -e 's;^\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\)\(.*\)$;<\1>\2[\3];' \
@@ -412,7 +413,7 @@
         AT="${cpu_arch}"
         AP="${AT}"
         AC="${AP}"
-        ST="[IBM ]AIX ${os_level}"
+        ST="[IBM ]<AIX >${os_level}"
         SP="${ST}"
         case "${os_level}" in
             [12]* ) SC="SVR2" ;;

CVSTrac 2.0.1