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

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

Revision: 554
          http://sourceforge.net/p/fvwm-crystal/code/554
Author:   dominique_libre
Date:     2013-12-11 17:03:55 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
functions/fullscreen: + Quit function to remove temporary files.

Modified Paths:
--------------
    ChangeLog
    fvwm/components/apps/DesktopIcons
    fvwm/components/functions/Fullscreen

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-12-11 16:47:38 UTC (rev 553)
+++ ChangeLog	2013-12-11 17:03:55 UTC (rev 554)
@@ -3,7 +3,13 @@
 Mercredi 10 décembre 2013 Dominique Michel
   fvwm-crystal: introduced code to remove orphaned control files in /tmp at startup.
   fvwm-crystal.play-movies: interval change to make it work in any directory.
-  
+  apps/DesktopIcons: use bash instead of sh. Bash is the de facto standard GNU/Linux
+  shell and it is allready in use by FVWM-Crystal. use killall instead of killall -9
+  to kill the helper script; separated Quit and ToRestart functions.
+  scripts/DesktopCheckMounts: use 1 temporary file to control it state. Cleanup this
+  file at exit or fvwm exit/crash.
+  functions/fullscreen: + Quit function to remove temporary files.
+
 Mercredi 4 septembre 2013 Dominique Michel
   Makefile: fixed .svn copy in make dist - replaced find command by rsync.
   NEWS: zpdated.

Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons	2013-12-11 16:47:38 UTC (rev 553)
+++ fvwm/components/apps/DesktopIcons	2013-12-11 17:03:55 UTC (rev 554)
@@ -42,14 +42,14 @@
 + I Test (EnvMatch ShowPartitions yes) GetPartitions
 # The number of row and columns {{{2
 + I PipeRead 'echo "SetEnv IconRowsNumber $(((($[vp.height]-92))/60))"'
-+ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [[ $(($[IconRowsNumber]*${tmpvar})) != $[IconNumber] ]]; then echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; else echo "SetEnv IconColumnsNumber ${tmpvar}"; fi'
++ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [ $(($[IconRowsNumber]*${tmpvar})) != $[IconNumber] ]; then echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; else echo "SetEnv IconColumnsNumber ${tmpvar}"; fi'
 # IconBox {{{1
 #+ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+$[infostore.DeskIconsXSup))))x$(($[vp.height]-92))+$((36+((50*$[IconColumnsNumber]))))+46"'
 
 # umount/pumount wrapper
 DestroyFunc DesktopUmount
 AddToFunc DesktopUmount
-+ I PipeRead 'if [[ $(echo $* | grep -e media) != "" ]]; \
++ I PipeRead 'if [ $(echo $* | grep -e media) != "" ]; \
       then exem="pumount"; \
       else exem="umount"; \
       fi ; \
@@ -88,9 +88,9 @@
       echo "AddToMenu /Partitions${line}"; \
       echo "+ ${line} Nop"; \
       echo "DesktopUmount ${line}"; \
-      if [[ "${line}" == "/" ]]; \
+      if [ "${line}" == "/" ]; \
       then icon="48x48/categories/Root.png"; \
-      else if [[ $(echo ${line} | grep -e cdrom -e dvd) != "" ]]; \
+      else if [ $(echo ${line} | grep -e cdrom -e dvd) != "" ]; \
       	   then icon="48x48/categories/CD.png"; \
 	   else icon="48x48/categories/Work_4.png"; \
 	   fi ; \
@@ -114,7 +114,7 @@
 
 DestroyFunc FindUMPartitions
 AddToFunc FindUMPartitions
-+ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do  partition=${line}; exist=0; while read lines; do if [[ ${partition} == ${lines} ]]; then exist=1; fi; done </tmp/Icon-Drives; if [[ ${exist} == 0 ]]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
++ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do  partition=${line}; exist=0; while read lines; do if [ ${partition} == ${lines} ]; then exist=1; fi; done </tmp/Icon-Drives; if [ ${exist} == 0 ]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
 
 DestroyFunc IconLauncher-generator
 AddToFunc IconLauncher-generator

Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen	2013-12-11 16:47:38 UTC (rev 553)
+++ fvwm/components/functions/Fullscreen	2013-12-11 17:03:55 UTC (rev 554)
@@ -136,6 +136,7 @@
 
 AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.19.*
 AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.20.*
+AddToFunc ExitFunction I Test (Quit) Exec rm -f $[infostore.TmpDirectory]/fullscreen.*
 
 # Be sure the temporary files are destroyed when a window is closed
 DestroyFunc Window-Fullscreen-Destroy

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