sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

python: Remove sys.path line rather than updating it when installing to python system path.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-12-27 17:30:59 +01:00
parent ff0f8bd9e6
commit 72d93599d9
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/Makefile
View File

@ -243,7 +243,7 @@ installman:: manpages installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
installmisc:: installdirs
@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir)
@$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
installpc:: installdirs
@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)

40
source4/script/installmisc.sh
View File

@ -1,28 +1,42 @@
#!/bin/sh
# install miscellaneous files
[ $# -eq 5 ] || {
echo "Usage: installmisc.sh SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR"
[ $# -eq 7 ] || {
echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
exit 1
}
SRCDIR="$1"
SETUPDIR="$2"
BINDIR="$3"
SBINDIR="$4"
PYTHONDIR="$5"
DESTDIR="$1"
SRCDIR="$2"
SETUPDIR="$3"
BINDIR="$4"
SBINDIR="$5"
PYTHONDIR="$6"
PYTHON="$7"
cd $SRCDIR || exit 1
if $PYTHON -c "import sys; sys.exit('$PYTHONDIR' in sys.path)"; then
PYTHON_PATH_NEEDS_FIXING=yes
echo "sys.path in python scripts will be updated to include $PYTHONDIR"
else
PYTHON_PATH_NEEDS_FIXING=no
fi
# fixup a python script to use the right path
fix_python_path() {
f="$1"
egrep 'sys.path.insert.*bin/python' $f > /dev/null && {
# old systems don't have sed -i :-(
sed "s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" < $f > $f.$$ || exit 1
mv -f $f.$$ $f || exit 1
chmod +x $f
}
if egrep 'sys.path.insert.*bin/python' $f > /dev/null; then
if [ "$PYTHON_PATH_NEEDS_FIXING" = "yes" ]; then
# old systems don't have sed -i :-(
sed "s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" < $f > $f.$$ || exit 1
else
# old systems don't have sed -i :-(
sed "s|\(sys.path.insert.*\)bin/python\(.*\)$||g" < $f > $f.$$ || exit 1
fi
mv -f $f.$$ $f || exit 1
chmod +x $f
fi
}
echo "Installing setup templates"