diff options
| author | Gerald Carter <jerry@samba.org> | 2003-11-07 23:04:52 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-11-07 23:04:52 +0000 |
| commit | f9230c937b1304e6864aa020a4e102749ca6f8ae (patch) | |
| tree | fb28683d2cdbe91ccb213c8f7494412e9a0edee9 /source3/script | |
| parent | a3aa2c9ed44f5967986d340456efd5828bd5f2ff (diff) | |
| download | samba-f9230c937b1304e6864aa020a4e102749ca6f8ae.tar.gz samba-f9230c937b1304e6864aa020a4e102749ca6f8ae.tar.bz2 samba-f9230c937b1304e6864aa020a4e102749ca6f8ae.zip | |
* only install swat html files once
* revert the change that prevent the guest
account from being added to a passdb backend
since it broke the build farm.
* apply patch from Alex Deiter to fix the
"smbldap_open: cannot access when not root
error" messages when looking up group
information (bug 281)
(This used to be commit 20bd309239199d85accb2b7aac6d4dd73e414f85)
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/installswat.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh index 7841a2a7b5..be0cdf3eef 100755 --- a/source3/script/installswat.sh +++ b/source3/script/installswat.sh @@ -28,16 +28,16 @@ done # Install images for ln in $LANGS; do -for f in $SRCDIR../swat/$ln/images/*.gif; do + 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 -# Install html help + # Install html help -for f in $SRCDIR../swat/$ln/help/*.html; do + for f in $SRCDIR../swat/$ln/help/*.html; do FNAME=$SWATDIR/$ln/help/`basename $f` echo $FNAME if [ "x$BOOKDIR" = "x" ]; then @@ -49,28 +49,28 @@ for f in $SRCDIR../swat/$ln/help/*.html; do cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? rm -f $f chmod 0644 $FNAME -done + done -# Install html documentation + # Install "server-side" includes -for f in $SRCDIR../docs/htmldocs/*.html; do - FNAME=$SWATDIR/help/`basename $f` + 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 -# Install "server-side" includes +# Install html documentation -for f in $SRCDIR../swat/$ln/include/*.html; do - FNAME=$SWATDIR/$ln/include/`basename $f` +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 - # Install Using Samba book (but only if it is there) if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then |