Attachment 163 Details for Bug 456 – Install msg files from ../swat/$lang.msg

[patch] Install msg files from ../swat/$lang.msg

bug456.patch (text/plain), 4.41 KB, created by Tim Potter on 2003-09-22 18:38:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Potter

Created: 2003-09-22 18:38:20 UTC

Size: 4.41 KB

patch

obsolete

>? source/configure.in-patch
>cvs server: Diffing source
>cvs server: Diffing source/aparser
>cvs server: Diffing source/aparser/templates
>cvs server: Diffing source/auth
>cvs server: Diffing source/bin
>cvs server: Diffing source/client
>cvs server: Diffing source/codepages
>cvs server: Diffing source/groupdb
>cvs server: Diffing source/include
>cvs server: Diffing source/intl
>Index: source/intl/lang_tdb.c
>===================================================================
>RCS file: /data/cvs/samba/source/intl/lang_tdb.c,v
>retrieving revision 1.7.2.7
>diff -u -r1.7.2.7 lang_tdb.c
>--- source/intl/lang_tdb.c	22 Sep 2003 17:39:44 -0000	1.7.2.7
>+++ source/intl/lang_tdb.c	23 Sep 2003 01:34:48 -0000
>@@ -128,7 +128,7 @@
> 	if (!lang) 
> 		return True;
> 
>-	asprintf(&msg_path, "%s.msg", lib_path((const char *)lang));
>+	asprintf(&msg_path, "%s/lang/%s/%s.msg", dyn_SWATDIR, lang, lang);
> 	if (stat(msg_path, &st) != 0) {
> 		/* the msg file isn't available */
> 		DEBUG(10, ("lang_tdb_init: %s: %s", msg_path, 
>cvs server: Diffing source/lib
>cvs server: Diffing source/libads
>cvs server: Diffing source/libsmb
>cvs server: Diffing source/locking
>cvs server: Diffing source/modules
>cvs server: Diffing source/msdfs
>cvs server: Diffing source/nmbd
>cvs server: Diffing source/nsswitch
>cvs server: Diffing source/pam_smbpass
>cvs server: Diffing source/pam_smbpass/samples
>cvs server: Diffing source/param
>cvs server: Diffing source/passdb
>cvs server: Diffing source/po
>cvs server: Diffing source/popt
>cvs server: Diffing source/printing
>cvs server: Diffing source/profile
>cvs server: Diffing source/python
>cvs server: Diffing source/python/examples
>cvs server: Diffing source/python/examples/spoolss
>cvs server: Diffing source/python/examples/tdbpack
>cvs server: Diffing source/python/samba
>cvs server: Diffing source/registry
>cvs server: Diffing source/rpc_client
>cvs server: Diffing source/rpc_parse
>cvs server: Diffing source/rpc_server
>cvs server: Diffing source/rpcclient
>cvs server: Diffing source/sam
>cvs server: Diffing source/script
>Index: source/script/installswat.sh
>===================================================================
>RCS file: /data/cvs/samba/source/script/installswat.sh,v
>retrieving revision 1.12.2.3
>diff -u -r1.12.2.3 installswat.sh
>--- source/script/installswat.sh	28 Aug 2003 21:23:04 -0000	1.12.2.3
>+++ source/script/installswat.sh	23 Sep 2003 01:34:49 -0000
>@@ -28,16 +28,19 @@
> # Install images
> for ln in $LANGS; do
> 
>-for f in $SRCDIR../swat/$ln/images/*.gif; do
>+if [ -d $SRCDIR../swat/$ln/images ]; then
>+  for f in $SRCDIR../swat/$ln/images/*.gif; do
>       FNAME=$SWATDIR/$ln/images/`basename $f`
>       echo $FNAME
>       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
>       chmod 0644 $FNAME
>-done
>+  done
>+fi
> 
> # Install html help
> 
>-for f in $SRCDIR../swat/$ln/help/*.html; do
>+if [ -d $SRCDIR../swat/$ln/help ]; then
>+  for f in $SRCDIR../swat/$ln/help/*.html; do
>       FNAME=$SWATDIR/$ln/help/`basename $f`
>       echo $FNAME
>       if [ "x$BOOKDIR" = "x" ]; then
>@@ -49,25 +52,40 @@
>       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
>       rm -f $f
>       chmod 0644 $FNAME
>-done
>+  done
>+fi
> 
> # Install html documentation
> 
>-for f in $SRCDIR../docs/htmldocs/*.html; do
>+if [ -d $SRCDIR../docs/htmldocs ]; then
>+  for f in $SRCDIR../docs/htmldocs/*.html; do
>       FNAME=$SWATDIR/help/`basename $f`
>       echo $FNAME
>       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
>       chmod 0644 $FNAME
>-done
>+  done
>+fi
> 
> # Install "server-side" includes
> 
>-for f in $SRCDIR../swat/$ln/include/*.html; do
>+if [ -d $SRCDIR../swat/$ln/include ]; then
>+  for f in $SRCDIR../swat/$ln/include/*.html; do
>       FNAME=$SWATDIR/$ln/include/`basename $f`
>       echo $FNAME
>       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
>       chmod 0644 $FNAME
>-done
>+  done
>+fi
>+
>+# Install msg translation file
>+
>+f=$SRCDIR../swat/$ln.msg
>+if [ -e $f ]; then
>+    FNAME=$SWATDIR/$ln/`basename $f`
>+    echo $FNAME
>+    cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
>+    chmod 0644 $FNAME
>+fi
> 
> done
> 
>@@ -122,4 +140,3 @@
> EOF
> 
> exit 0
>-
>cvs server: Diffing source/smbd
>cvs server: Diffing source/smbwrapper
>cvs server: Diffing source/stf
>cvs server: Diffing source/tdb
>cvs server: Diffing source/tests
>cvs server: Diffing source/torture
>cvs server: Diffing source/ubiqx
>cvs server: Diffing source/utils
>cvs server: Diffing source/web
>cvs server: Diffing source/wrepld

Actions: View

Attachments on bug 456: 155 | 163