From: Michael Prokop <mika@grml.org>
Date: Fri, 6 Apr 2007 20:42:59 +0000 (+0200)
Subject: etc/grml/script-functions: replace $UID with id -u
X-Git-Tag: 0.2.41
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=0e59a65165a77ec4bf0b6a048c1a8469f540059e;hp=7c7e3dc14d767207fe750a47f4b2f9a99714922e;p=grml-etc-core.git

etc/grml/script-functions: replace $UID with id -u
---

diff --git a/debian/changelog b/debian/changelog
index 3b552a9..8887ffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc-core (0.2.41) unstable; urgency=low
+
+  * /etc/grml/script-functions: replace $UID with 'id -u' so we improve
+    compability for POSIX/dash.
+
+ -- Michael Prokop <mika@grml.org>  Fri,  6 Apr 2007 22:42:16 +0200
+
 grml-etc-core (0.2.40) unstable; urgency=low
 
   * /etc/skel/.vimrc: do not set 'tw=72' by default anymore.
diff --git a/etc/grml/script-functions b/etc/grml/script-functions
index bc30ca5..61c24d9 100644
--- a/etc/grml/script-functions
+++ b/etc/grml/script-functions
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Sep 16 13:08:16 CEST 2006 [mika]
+# Latest change: Fre Apr 06 22:42:04 CEST 2007 [mika]
 ################################################################################
 
 # {{{ set default PATH
@@ -14,7 +14,7 @@ setpath(){
 
 # {{{ check for root-permissions
 check4root(){
-  if [ "$UID" != 0 ] ; then
+  if [ "$(id -u 2>/dev/null)" != 0 ] ; then
     echo 1>&2 "Error: please run this script with uid 0 (root)." ; return 1
   fi
 }
@@ -22,7 +22,7 @@ check4root(){
 
 # {{{ check for user permissions
 check4user(){
-  if [ "$UID" == 0 ] ; then
+  if [ "$(id -u 2>/dev/null)" = 0 ] ; then
     echo 1>&2 "Error: please do not run this script with uid 0 (root)." ; return 1
   fi
 }