X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ebdc8c462c0c550de85b77d50463072372ad1839;hb=ed2bfc923b2ebcb41dfd0197922c4ed90910eb82;hp=dd536da3a807dbae029fed567dc164959565d4ac;hpb=5036c2b87817f76ab042593f7160cf36685417f7;p=carnet-upgrade.git

diff --git a/debian/postinst b/debian/postinst
index dd536da..ebdc8c4 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,6 +5,10 @@ set -e
 [ "$1" = "configure" ] || exit 0
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
+# Load debconf
+. /usr/share/debconf/confmodule
+db_version 2.0
+
 # Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
@@ -16,7 +20,7 @@ fi
 # perl se buni ako nema postavljen defaultni locale
 # stavit cemo en_US.UTF-8
 
-if [ ! grep -q "^en_US.UTF-8 UTF-8" /etc/locale.gen ]; then
+if ! grep -q "^en_US.UTF-8 UTF-8" /etc/locale.gen; then
 	# generirat cemo najpotrebnije locale (HR, EN, te HR.UTF i EN.UTF8)
 	cp_check_and_sed '# en_US.UTF-8 UTF-8' \
 	's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' \
@@ -38,16 +42,13 @@ if [ ! grep -q "^en_US.UTF-8 UTF-8" /etc/locale.gen ]; then
 fi
 
 # Ako ima već neki default ne diramo ga
-if [ ! -f /etc/default/locale ]; then
-	cat > /etc/default/locale <<EOF
+if [ -f /etc/default/locale ]; then
+	if [ ! $(grep -q "^LANG" /etc/default/locale) ]; then
+        	cat > /etc/default/locale <<EOF
 LANG=en_US.UTF-8
 LANGUAGE="en_US:en"
 EOF
+	fi
 	update-locale
 fi
-
-# Load debconf
-. /usr/share/debconf/confmodule
-db_version 2.0
-
 #DEBHELPER#