From 1c7b0dd9a7cea01c294061da6c94bf7450b6df86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sat, 2 Apr 2016 15:52:20 +0200
Subject: [PATCH] Make PID files unique for X session.

---
 autostart/autostart/redshift.sh    | 2 +-
 autostart/autostart/wallchanger.sh | 2 +-
 i3/i3/config                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/autostart/autostart/redshift.sh b/autostart/autostart/redshift.sh
index 52e27b2..47aa6f6 100755
--- a/autostart/autostart/redshift.sh
+++ b/autostart/autostart/redshift.sh
@@ -4,4 +4,4 @@ redshift_colortemp="6000:3300"
 
 log "starting redshift-gtk"
 redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp" & &>> "$LOGFILE"
-printf '%s' $! > "$RUNDIR"/redshift.pid
+printf '%s' $! > "$RUNDIR"/redshift.${XDG_SESSION_ID}.pid
diff --git a/autostart/autostart/wallchanger.sh b/autostart/autostart/wallchanger.sh
index 5c5ebbe..aea19fc 100755
--- a/autostart/autostart/wallchanger.sh
+++ b/autostart/autostart/wallchanger.sh
@@ -1,6 +1,6 @@
 path_wallchanger="$HOME/projects/wallchanger/wallchanger"
-wallchanger_pidfile="$RUNDIR/wallchanger.pid"
 wallpaper_directory="$HOME/pictures/wallpaper/misc"
+wallchanger_pidfile="$RUNDIR/wallchanger.${XDG_SESSION_ID}.pid"
 wallpaper_logfile="$LOGDIR/wallpaper.log"
 wallpaper_fallback="$HOME/.i3/data/wallpaper/"
 wallpaper_interval="10800"
diff --git a/i3/i3/config b/i3/i3/config
index f518db2..99fb515 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -271,8 +271,8 @@ bindsym XF86AudioPlay exec --no-startup-id mpc toggle
 bindsym XF86AudioPrev exec --no-startup-id mpc prev
 bindsym XF86AudioNext exec --no-startup-id mpc next
 
-bindsym $mod+o exec --no-startup-id xautorandr ; exec --no-startup-id kill -SIGUSR2 $(cat $RUNDIR/wallchanger.pid)'"
-bindsym $mod+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.pid)
+bindsym $mod+o exec --no-startup-id xautorandr ; exec --no-startup-id kill -SIGUSR2 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)'"
+bindsym $mod+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)
 
 ################################################################################
 ### BARS #######################################################################