[gtk-osx] Protect a jhbuildrc link from being overwritten



commit 997b90084da08ee2c77493bebd4cc3d91ea47ba2
Author: John Ralls <jralls ceridwen us>
Date:   Thu Sep 19 13:21:06 2013 -0700

    Protect a jhbuildrc link from being overwritten

 gtk-osx-build-setup.sh |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
index 6e4a1b3..9dff699 100755
--- a/gtk-osx-build-setup.sh
+++ b/gtk-osx-build-setup.sh
@@ -88,12 +88,16 @@ if [ -e "$SOURCE/jhbuild/autogen.sh" ]; then
 else
     (cd $SOURCE/jhbuild && make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null) || do_exit "Jhbuild 
installation failed";
 fi
-echo "Installing jhbuild configuration..."
-curl -ks $BASEURL/jhbuildrc-gtk-osx -o $HOME/.jhbuildrc || do_exit "Didn't get jhbuildrc"
-curl -ks $BASEURL/jhbuildrc-gtk-osx-fw-10.4 -o $HOME/.jhbuildrc-fw-10.4
-curl -ks $BASEURL/jhbuildrc-gtk-osx-cfw-10.4 -o $HOME/.jhbuildrc-cfw-10.4
-curl -ks $BASEURL/jhbuildrc-gtk-osx-cfw-10.4u -o $HOME/.jhbuildrc-cfw-10.4u
-curl -ks $BASEURL/jhbuildrc-gtk-osx-fw-10.4-test -o $HOME/.jhbuildrc-fw-10.4-test
+#If ~/.jhbuildrc is a link, assume that it's to a gtk-osx repository
+#and don't touch it.
+if [ ! -L $HOME/.jhbuildrc ]; then
+    echo "Installing jhbuild configuration..."
+    curl -ks $BASEURL/jhbuildrc-gtk-osx -o $HOME/.jhbuildrc || do_exit "Didn't get jhbuildrc"
+    curl -ks $BASEURL/jhbuildrc-gtk-osx-fw-10.4 -o $HOME/.jhbuildrc-fw-10.4
+    curl -ks $BASEURL/jhbuildrc-gtk-osx-cfw-10.4 -o $HOME/.jhbuildrc-cfw-10.4
+    curl -ks $BASEURL/jhbuildrc-gtk-osx-cfw-10.4u -o $HOME/.jhbuildrc-cfw-10.4u
+    curl -ks $BASEURL/jhbuildrc-gtk-osx-fw-10.4-test -o $HOME/.jhbuildrc-fw-10.4-test
+fi
 if [ ! -f $HOME/.jhbuildrc-custom ]; then
     curl -ks $BASEURL/jhbuildrc-gtk-osx-custom-example -o $HOME/.jhbuildrc-custom || do_exit "Didn't get 
jhbuildrc-custom"
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]