Use the pidfile variable everywhere.

1 files changed, 3 insertions, 3 deletions

diff --git a/gpsfake b/gpsfake
index 8cc3005c..aecc741d 100755
--- a/gpsfake
+++ b/gpsfake
@@ -35,23 +35,23 @@ except:
     sys.exit(1)
 slave = os.ttyname(slave_fd)
 
+pidfile  = "/tmp/gpsfake_pid-%s" % os.getpid()
 spawncmd = "gpsd -N -P %s -f %s %s" % (pidfile, slave, doptions)
 spawncmd = spawncmd.strip()
 
-pidfile  = "/tmp/gpsfake_pid-%s" % os.getpid()
-
 if not spawn:
     raw_input("gpsfake: launch '%s' and press enter..." % spawncmd)
 elif os.system(spawncmd + " &"):
     sys.stderr.write("gpsfake: '%s' failed.\n" % spawncmd)
     sys.exit(1)
 else:
+    time.sleep(1)	# Time for pidfile to get written.
     sys.stderr.write("gpsfake: '%s' launch OK.\n" % spawncmd)
 
     fp = open(pidfile)
     pid = int(fp.read())
     fp.close()
-    os.remove("/tmp/gpsfake%s" % os.getpid())
+    os.remove(pidfile)
 
 try:
     logfp = open(logfile, "r")