Changeset 541

Timestamp:

05/17/08 16:52:16 (7 months ago)

Author:

free

Message:

Code clean up

Location:

cdd-utils/trunk

Files:

• cdd-config (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• lib/common.sh (modified) (1 diff)

cdd-utils/trunk/cdd-config

@@ -2 +2 @@
 
 libdir=/usr/lib/cdd-utils
-
-lsb=/etc/lsb-release
-
-if [ ! $lsb ]; then # we're probably on etch
-DISTRIB_ID=Debian
-DISTRIB_RELEASE=4.0
-DISTRIB_CODENAME=etch
-DISTRIB_DESCRIPTION="Debian 4.0"
-else
-  . $lsb
-fi
 
 . $libdir/common.sh

cdd-utils/trunk/debian/postinst

@@ -1 @@
-#! /bin/sh
-# postinst script for cdd-utils
-#
-# see: dh_installdeb(1)
-
-set -e
+#! /bin/sh -e
 
 APT_KEY=/usr/share/cdd-utils/apt/key

cdd-utils/trunk/lib/common.sh

@@ -51 +51 @@
 is_ubuntu () {
 
-    if [ "$DISTRIB_ID" = "Ubuntu" ]; then
+    cfg=/etc/lsb-release
+    if ! exists $cfg; then return 1; fi
+
+    if grep -q "^DISTRIB_ID=Ubuntu" $cfg; then
         return 0
     else