[Debian-hebrew-package] [svn] r334 - pkg/user-he/trunk/scripts

[Lior Kaplan]

Author: kaplan-guest
Date: Mon Jan 16 23:15:01 2006
New Revision: 334

Modified:
   pkg/user-he/trunk/scripts/hebrew-settings
Log:
Changes:
1. do root check by user ID not username ("root" != UID 0).
2. Removed some locales. See http://alioth.debian.org/tracker/index.php?func=detail&aid=302725&group_id=30727&atid=411849
3. fix a typo ...


Modified: pkg/user-he/trunk/scripts/hebrew-settings
==============================================================================
--- pkg/user-he/trunk/scripts/hebrew-settings	(original)
+++ pkg/user-he/trunk/scripts/hebrew-settings	Mon Jan 16 23:15:01 2006
@@ -3,8 +3,8 @@
 set +e
 
 # check for root
-if [ $USER != "root" ]; then
-	echo "hebrew-settings: you need to be root to run this script"
+if [ `id -u` != 0 ]; then
+	echo "$0: you need to be root to run this script"
 	exit 1
 fi
 
@@ -34,11 +34,8 @@
 		debconf-set-selections << __END__
 
 		# locales preseed for enabled system
-		# FIXME: what locale to use ? en_IL ? - no such locale
-		# setting of LC_MESSAGES ? - do we want to edit system files
-		# by hand ?
-		locales locales/default_environment_locale string C
-		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8,en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, fr_FR.UTF-8 UTF-8, es_MX.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
+		locales locales/default_environment_locale string en_US.UTF-8
+		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8, en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
 
 __END__
 	else
@@ -46,7 +43,7 @@
 
 		# locales preseed
 		locales locales/default_environment_locale string he_IL.UTF-8
-		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8,en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, fr_FR.UTF-8 UTF-8, es_MX.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
+		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8, en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
 
 __END__
 	fi
@@ -145,7 +142,7 @@
 		--type string --set /desktop/gnome/background/picture_filename \
 		"/usr/share/pixmaps/backgrounds/gnome/translucent/ellipsis.png"
 
-	# Set filrefox to be the default gnome browser and not epiphany
+	# Set firefox to be the default gnome browser and not epiphany
 	gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
 		--set -t string /desktop/gnome/applications/browser/exec "/usr/bin/firefox"