summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@noraisin.net>2009-05-24 12:23:57 +0100
committerJan Schmidt <thaytan@noraisin.net>2009-05-24 12:26:04 +0100
commit6219590380fcaba4a05e52844aa4d935c4c502df (patch)
tree8d5c68bae74b8311b79ce2d241e5145586511a82
parentb5022973ab70eb315c657a66187fb96760e64649 (diff)
www: Enforce our shared ownership more strictly. Clean up plugin checkouts
Set permissions a bit more in the www-update-complete script, to attempt to avoid leaving behind unshared directories. Remove the plugin-inspect checkout directories before and afterward, in case they get left behind by someone hitting ctrl-c during the build.
-rwxr-xr-xbin/www-update-complete3
-rw-r--r--src/htdocs/documentation/Makefile.am3
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/www-update-complete b/bin/www-update-complete
index 43fb993a..68c52686 100755
--- a/bin/www-update-complete
+++ b/bin/www-update-complete
@@ -8,6 +8,9 @@ umask 0002
chown -R :gstreamer * 2> /dev/null
chmod -R g+w * 2> /dev/null
git pull
+find . -type d -print0 | xargs -0 chmod g+ws 2> /dev/null
src/autogen.sh
make clean
make
+chown -R :gstreamer * 2> /dev/null
+chmod -R g+w * 2> /dev/null
diff --git a/src/htdocs/documentation/Makefile.am b/src/htdocs/documentation/Makefile.am
index f69f6bd9..2448ccb5 100644
--- a/src/htdocs/documentation/Makefile.am
+++ b/src/htdocs/documentation/Makefile.am
@@ -2,13 +2,14 @@ built_pages = index.html licensing.html rtp.html plugins.html splitup.html gstre
plugins.xml:
for m in gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad; do \
+ @rm -rf $$m-checkouts.git $$m\-checkouts\-plugins-inspect; \
git clone --depth 1 git://anongit.freedesktop.org/gstreamer/$$m $$m-checkouts.git; \
ln -s $$m-checkouts.git/docs/plugins/inspect $$m\-checkouts\-plugins-inspect; \
done
echo "<plugins>" > plugins.xml
cat */*.xml >> plugins.xml
echo "</plugins>" >> plugins.xml
- rm -rf gst-plugins-*
+ rm -rf *-checkouts.git *-checkouts-plugins-inspect
plugins.xml-update:
rm -f plugins.xml