From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Thu, 3 Apr 2014 09:54:28 +0000 (+1300)
Subject: A few minor tweaks.
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3712f8faa5444dadee80ba50261d4446ab0b693;p=laptop-tools.git

A few minor tweaks.
---

diff --git a/NetworkManager/dispatcher.d/20network-shares b/NetworkManager/dispatcher.d/20network-shares
index d93f86c..2159099 100755
--- a/NetworkManager/dispatcher.d/20network-shares
+++ b/NetworkManager/dispatcher.d/20network-shares
@@ -8,7 +8,7 @@ gateway=$(ip route show 0.0.0.0/0 | awk '{print $3}')
 if [ "x$gateway" != "x" ]
 then
     ping -c 1 $gateway
-    mactest=$(arp -n -a $gateway | awk '{print $4}')
+    mactest=$(arp -n -a $gateway | awk '{print $4}' | head -1)
 fi
 
         date >> /tmp/nm.set
@@ -29,9 +29,9 @@ case "$2" in
             done
         else
             echo "On a foreign network, make sure we clean up" >> /tmp/nm.set
-            for user in $(ls /home/*/bin/network-bookmarks-remove | sed 's/\/home\///; s/\/.*//')
+            for user in $(ls /home/*/.gtk-bookmarks | sed 's/\/home\///; s/\/.*//')
             do
-                sudo -u $user /home/$user/bin/network-bookmarks-remove
+                sudo -u $user /usr/bin/network-bookmarks-remove
             done
 
             /etc/init.d/autofs stop