[gnome-initial-setup/gnome-3-14] Avoid a race in starting the welcome tour

[Matthias Clasen <matthiasc src gnome org>]

commit 64938cb7c5410423a444d06069be478f05f8ad89
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jul 15 11:06:59 2015 -0400

    Avoid a race in starting the welcome tour
    
    There is a race between the welcome tour script removing the marker
    file, and gnome-session notificing that it is gone and killing the
    autostarted script. If the script wins the race and manages to start
    yelp first, things work ok, but if gnome-session wins the race, yelp
    never shows up.
    
    Fix this by only removing the file after yelp is launched.

 data/gnome-welcome-tour |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
index 0cc9f8c..c479296 100755
--- a/data/gnome-welcome-tour
+++ b/data/gnome-welcome-tour
@@ -2,11 +2,10 @@
 
 cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
 
-rm -f $cfgdir/run-welcome-tour
-
 # Don't do anything if yelp isn't installed
 yelp_path=$(which yelp 2>/dev/null)
 if test -z "${yelp_path}"; then
+    rm -f $cfgdir/run-welcome-tour
     exit
 fi
 
@@ -19,3 +18,4 @@ EOF
 fi
 
 yelp help:gnome-help/getting-started
+rm -f $cfgdir/run-welcome-tour