From 138ce54c5e8498dcdcf385bf2d662892ff258982 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 24 May 2009 11:25:46 +0000
Subject: Fix bashism ($UID). Debian Bug#530081.

svn path=/branches/BRANCH_6-3/; revision=5308
---
 NEWS               | 3 +++
 contrib/fetchsetup | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6dddbd6a..a347f207 100644
--- a/NEWS
+++ b/NEWS
@@ -70,6 +70,9 @@ fetchmail 6.3.10 (not yet released):
 * Make the comparison of the SSL fingerprints case insensitive, to
   ease its use. Suggested by Daniel Richard G.
 
+# CHANGES TO CONTRIB
+* Fix bashism in contrib/fetchsetup. Fixes Debian Bug#530081.
+
 # DOCUMENTATION
 * Some parts of the the manual page were revised for clarity, accuracy, and
   updated recommendations (particularly SSL/TLS) and formatting conventions from
diff --git a/contrib/fetchsetup b/contrib/fetchsetup
index 0adf4751..e3584b03 100755
--- a/contrib/fetchsetup
+++ b/contrib/fetchsetup
@@ -12,12 +12,12 @@ cat << EOF
 EOF
 }
 
-if [ ! "$UID" = "0" ]; then
 echo "[$LOGNAME] You need to be [root] to run this script."
 echo "You could login: root"
 echo "You could also try one of these: # sudo fetchsetup"
 echo "                                 # su -c fetchsetup"
 exit 1
+if [ "$(id -ur)" != "0" ]; then
 fi
 
 MSG
-- 
cgit v1.2.3