[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Some testresults b1 combined server



On Mon, Aug 19, 2013 at 01:24:55AM +0200, Jürgen Leibner wrote:
 
> [..] and the web page shown is the English one, not the German one it 
> should, because I installed German.

This is fixed applying this patch (the code could be smarter, I guess):

Index: wheezy/debian-edu-config/share/debian-edu-config/tools/show-welcome-webpage
===================================================================
--- wheezy/debian-edu-config/share/debian-edu-config/tools/show-welcome-webpage	(Revision 82207)
+++ wheezy/debian-edu-config/share/debian-edu-config/tools/show-welcome-webpage	(Arbeitskopie)
@@ -6,16 +6,21 @@
 set -e
 
 # Allow lookup script to be replaced using /etc/debian-edu/config
-GETDEFAULTHOMEPAGE=/usr/share/debian-edu-config/tools/get-default-homepage
+GETDEFAULTHOMEPAGE=$(/usr/share/debian-edu-config/tools/get-default-homepage)
 
 if [ -e /etc/debian-edu/config ] ; then
     . /etc/debian-edu/config
 fi
 
 if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
-    welcomeurl=$($GETDEFAULTHOMEPAGE || true)
-else
-    welcomeurl=http://www.skolelinux.org/
+    if wget ${GETDEFAULTHOMEPAGE}index.html.$(echo $LANGCODE) > /dev/null 2>&1 ; then
+        welcomeurl="${GETDEFAULTHOMEPAGE}index.html.$(echo $LANGCODE)"
+        rm index.html.$(echo $LANGCODE)
+    else
+        welcomeurl=$GETDEFAULTHOMEPAGE || true
+    fi
+    else
+        welcomeurl=http://www.skolelinux.org/
 fi
 
 if [ -z "$welcomeurl" ] || [ "about:blank" = "$welcomeurl" ]; then
 

Wolfgang

Attachment: signature.asc
Description: Digital signature


Reply to: