[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[287] fvwm/components/functions

[<dom...@us...>]

Revision: 287
          http://sourceforge.net/p/fvwm-crystal/code/287
Author:   dominique_libre
Date:     2013-04-24 09:41:11 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
functions/Icon-Launcher: fix possible freeze at startup; make it more robust and POSIX compliant

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Icon-Launcher

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-24 08:08:57 UTC (rev 286)
+++ ChangeLog	2013-04-24 09:41:11 UTC (rev 287)
@@ -10,7 +10,9 @@
   disappear with EWMH-Toggle. Work best with StaloneTray.
   recipes/Amiga: removed non needed tests; add Icon-Launcher
   functions/Fullscreen: cleanup
-  functions/Icon-Launcher: cleanup; fix for wrong mount point.
+  functions/Icon-Launcher: cleanup; fix possible freeze at startup wih a
+  check on /proc/ounts instead of a mount command. Replaced cut and grep
+  by awk. This should be POSIX compliant, more robust and show more partitions.
 
 Lundi 22 Avril Dominique Michel
   recipes/*: move some SetEnv to Infostore; include Fullscreen functions

Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher	2013-04-24 08:08:57 UTC (rev 286)
+++ fvwm/components/functions/Icon-Launcher	2013-04-24 09:41:11 UTC (rev 287)
@@ -10,7 +10,7 @@
 # You can also move the icons, but the moves will not survive a restart.
 # The icons are like in the AmigaOS with 2 different pictures.
 #
-# Requirement: mount, grep, cut, Thunar, and Fvwm.
+# Requirement: gawk, sort, Thunar, and Fvwm.
 # In order to use it, add
 # 
 # Test (x thunar) PipeRead 'pidof rox 1>/dev/null || pidof nautilus 1>/dev/null || echo "Include components/functions/Icon-Launcher"'
@@ -65,7 +65,7 @@
 # which drives are mounted into the system
 DestroyFunc Make-Icons
 AddToFunc Make-Icons
-+ I PipeRead "mount | grep ^/dev | cut -d \" \" -f 3 | sort > /tmp/Icon-Drives"
++ I PipeRead "gawk \'/^\\/dev\\// { print $$$2; }\' </proc/mounts |sort > /tmp/Icon-Drives"
 # Root
 #+ I PipeRead 'Root="/"; echo "Launcher Root 48x48/categories/Boing_4.png"; \
 #	echo "All (Root) Layer 0 0"; \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.