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

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

Revision: 262
          http://sourceforge.net/p/fvwm-crystal/code/262
Author:   dominique_libre
Date:     2013-04-19 19:35:55 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Music*: quoting must survive the PipeReads

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Music
    fvwm/components/functions/Music-alsaplayer
    fvwm/components/functions/Music-audacious
    fvwm/components/functions/Music-cmus
    fvwm/components/functions/Music-mocp
    fvwm/components/functions/Music-xmms2

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-19 19:16:42 UTC (rev 261)
+++ ChangeLog	2013-04-19 19:35:55 UTC (rev 262)
@@ -7,7 +7,8 @@
   modules.
   styles/FocusPoolicy-Amiga; FocusPolicy-FVWM-Crystal-Raise; FocusPolicy-
   MSWindow: Added FPFocusClickModifiers to fix wrong behaviour with NumLock
-  functions/Media: playlists functions: fic quoting, it must survive the PipeReads
+  functions/Media; functions/Music*: playlists functions: fic quoting,
+  it must survive the PipeReads
 
 Jeudi 18 Avril Dominique Michel
   functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved

Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music	2013-04-19 19:35:55 UTC (rev 262)
@@ -146,14 +146,14 @@
 # Note: Visualy redundant; TODO: A recursive generator like in remove playlist
 DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
 AddToFunc FuncFvwmMenuCopyPlaylistDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
-    --dir "$0" --exec-title "-" --command-file "${myexec}" \
+    --dir \"$0\" --exec-title "-" --command-file "${myexec}" \
     --func-name "FuncFvwmMenuCopyPlaylistDirectory"'
 
 DestroyMenu /Music/CopyPlaylist

Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-alsaplayer	2013-04-19 19:35:55 UTC (rev 262)
@@ -49,15 +49,15 @@
 
 # /Music/LoadPlaylist
 AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="alsaplayer -e";; \
 	"$[infostore.UserManagedAudioPlaylists]"*) myexec="alsaplayer -e";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
-    --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+    --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
     --func-name "FuncFvwmMenuAudioDirectory"'
 
 AddToFunc Music-ClearPlaylist

Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-audacious	2013-04-19 19:35:55 UTC (rev 262)
@@ -57,16 +57,16 @@
 
 # /Music/LoadPlaylist
 AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="audacious";; \
 	"$[infostore.UserManagedAudioPlaylists]"*) myexec="audacious";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
     --func="FuncFvwmMenuAudioDirectory" \
-    --exec-file "^${myexec}" --dir "$0" \
+    --exec-file "^${myexec}" --dir \"$0\" \
     --exec-t="-"'
 
 AddToFunc Music-ClearPlaylist

Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-cmus	2013-04-19 19:35:55 UTC (rev 262)
@@ -41,15 +41,15 @@
 
 # /Music/LoadPlaylist
 AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="cmus-remote -l";; \
 	"$[infostore.UserManagedAudioPlaylists]"*) myexec="cmus-remote -l";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
-    --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+    --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
     --func-name "FuncFvwmMenuAudioDirectory"'
 
 AddToFunc Playlist-generator-button

Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-mocp	2013-04-19 19:35:55 UTC (rev 262)
@@ -36,16 +36,16 @@
 # Player controls and main vol
 # mouse 1 Menu /Playlist-button {{{1
 AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="mocp --sync --append";; \
 	"$[infostore.UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
     --func="FuncFvwmMenuAudioDirectory" \
-    --exec-file "^${myexec}" --dir "$0" \
+    --exec-file "^${myexec}" --dir \"$0\" \
     --exec-t="-"'
 
 AddToFunc Music-ClearPlaylist

Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2	2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-xmms2	2013-04-19 19:35:55 UTC (rev 262)
@@ -77,15 +77,15 @@
 
 # /Music/LoadPlaylist
 AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
 	"$[infostore.AudioPlaylists]"*) myexec="$[infostore.fvwm_audio_exec]";; \
 	"$[infostore.UserManagedAudioPlaylists]"*) myexec="$[infostore.fvwm_audio_exec]";; \
     esac; \
-    test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
-    test -f "$0"/.media.png && mypng="$0"/.media.png; \
+    test -f \"$0\"/.icontitle.png && mytitle=\"$0\"/.icontitle.png; \
+    test -f \"$0\"/.media.png && mypng=\"$0\"/.media.png; \
     fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
     --icon-file "${mypng:-22x22/categories/Audio.png}" \
-    --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+    --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
     --func-name "FuncFvwmMenuAudioDirectory"'
 
 AddToFunc Music-RemoveSong

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