[gst-cvs] thomasvs gstreamer: gstreamer/ gstreamer/docs/faq/

[<tho...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     thomasvs
Date:           Mon Nov 07 2005  10:16:25 PST

Log message:
        * docs/faq/gst-uninstalled:
          fix up PS1 for systems that try to reset it

Modified files:
    .               : ChangeLog
    docs/faq        : gst-uninstalled

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1839&r2=1.1840
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/faq/gst-uninstalled.diff?r1=1.15&r2=1.16

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -d -r1.1839 -r1.1840
--- ChangeLog	7 Nov 2005 10:33:07 -0000	1.1839
+++ ChangeLog	7 Nov 2005 18:16:12 -0000	1.1840
@@ -1,3 +1,8 @@
+2005-11-07  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/faq/gst-uninstalled:
+	  fix up PS1 for systems that try to reset it
 2005-11-07  Wim Taymans  <wi...@fl...>
 
 	* gst/base/gstbasesrc.c: (gst_base_src_init),
Index: gst-uninstalled
RCS file: /cvs/gstreamer/gstreamer/docs/faq/gst-uninstalled,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gst-uninstalled	6 Oct 2005 21:09:11 -0000	1.15
+++ gst-uninstalled	7 Nov 2005 18:16:13 -0000	1.16
@@ -42,10 +42,8 @@
 PATH=$GST/gstreamer/tools:$GST/gst-plugins/tools:$GST/gst-player/src:$GST/gst-editor/src:$GST/prefix/bin:$PATH
 # /some/path: makes the dynamic linker look in . too, so avoid this
 export LD_LIBRARY_PATH=$GST/prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-python/pkgconfig:$PKG_CONFIG_PATH
-export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gst-monkeysaudio:$GST/plugins:$GST_PLUGIN_PATH
-export GST_PLUGIN_SYSTEM_PATH=
-export GST_REGISTRY=$GST/gstreamer/registry.xml
+export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-python/pkgconfig:$GST/gnonlin:$PKG_CONFIG_PATH
+export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-ffmpeg:$GST/gst-monkeysaudio:$GST/gnonlin:$GST/plugins:$GST_PLUGIN_PATH
 export MANPATH=$GST/gstreamer/tools:$GST/prefix/share/man:$MANPATH
 pythonver=`python -c "import sys; print sys.version[:3]"`
 export PYTHONPATH=$GST/gst-python:$GST/prefix/lib/python$pythonver/site-packages:$PYTHONPATH
@@ -60,4 +58,10 @@
 # set up prompt to help us remember we're in a subshell, cd to
 # the gstreamer base dir and start $SHELL
 cd $GST
-PS1="[gst-$VERSION] $PS1" $SHELL
+shell=$SHELL
+if test "x$SHELL" == "x/bin/bash"
+then
+  # debian/ubuntu resets our PS1.  bastards.
+  shell="$SHELL --norc --noprofile"
+fi
+PS1="[gst-$VERSION] $PS1" $shell