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

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

Revision: 545
          http://sourceforge.net/p/fvwm-crystal/code/545
Author:   dominique_libre
Date:     2013-08-31 22:53:13 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
fixed bashisms in crystal fvwm files

Modified Paths:
--------------
    fvwm/components/apps/DesktopIcons
    fvwm/components/functions/EWMH-BaseStruts
    fvwm/components/functions/Feedback
    fvwm/components/functions/Fvwm-Crystal-Menu
    fvwm/components/functions/Media
    fvwm/components/functions/Mixer
    fvwm/components/functions/Xdg-User-Dirs
    fvwm/components/functions/Xephyr

Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/apps/DesktopIcons	2013-08-31 22:53:13 UTC (rev 545)
@@ -42,16 +42,16 @@
 + 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}"; else echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; 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) != "" ]]; \
-      then exem="pumount"; \
-      else exem="umount"; \
++ I PipeRead 'if [ "`echo $* | grep -e media`" = "" ]; \
+      then exem="umount"; \
+      else exem="pumount"; \
       fi ; \
       echo "+ \\\"Unmount $*\\\" Exec exec ${exem} $*"'
 
@@ -88,11 +88,11 @@
       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) != "" ]]; \
-      	   then icon="48x48/categories/CD.png"; \
-	   else icon="48x48/categories/Work_4.png"; \
+      else if [ "$(echo ${line} | grep -e cdrom -e dvd)" = "" ]; \
+      	   then icon="48x48/categories/Work_4.png"; \
+	   else icon="48x48/categories/CD.png"; \
 	   fi ; \
       fi ; \
       echo "*DesktopIcons: (1x1, Padding 1 1, Frame 0, Icon ${icon}, ActiveIcon ${icon}.active.png, PressIcon ${icon}.active.png, Action (Mouse 1) $[infostore.FileBrowser1] ${line} $[infostore.SILENT], Action (Mouse 2) $[infostore.FileBrowser2] ${line} $[infostore.SILENT], Action (Mouse 3) Menu /Partitions${line})"; \
@@ -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/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/EWMH-BaseStruts	2013-08-31 22:53:13 UTC (rev 545)
@@ -87,7 +87,7 @@
 + I All (gDeskCal)			Iconify false
 + I All (trayer)			Iconify false
 + I All (FvwmStalonePanel)		Iconify false
-PipeRead "if [[ $(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:') ==  Amiga ]]; then echo '+ I Restore-TopBar-RaiseLower'; fi"
+PipeRead "if [ \"$(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:')\" = \"Amiga\" ]; then echo '+ I Restore-TopBar-RaiseLower'; fi"
 + I EWMH-Set-Panel
 + I $0 $1 $2 $3 Interface_Hide $0 $1 $2 $3
 

Modified: fvwm/components/functions/Feedback
===================================================================
--- fvwm/components/functions/Feedback	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Feedback	2013-08-31 22:53:13 UTC (rev 545)
@@ -77,5 +77,4 @@
 *SetBrowser-Dialog: Line center
 
 # Check if $BROWSER exist, if not chek preference, if not set it.{{{1
-PipeRead 'if [[ "$BROWSER" == "" ]]; then if [[ -f "$FVWM_USERDIR/preferences/BROWSER" ]]; then echo LoadPreferences BROWSER; else echo Module FvwmForm SetBrowser-Dialog; fi; fi'
-
+PipeRead 'if [ "$BROWSER" = "" ]; then if [ -f "$FVWM_USERDIR/preferences/BROWSER" ]; then echo LoadPreferences BROWSER; else echo Module FvwmForm SetBrowser-Dialog; fi; fi'

Modified: fvwm/components/functions/Fvwm-Crystal-Menu
===================================================================
--- fvwm/components/functions/Fvwm-Crystal-Menu	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Fvwm-Crystal-Menu	2013-08-31 22:53:13 UTC (rev 545)
@@ -47,7 +47,7 @@
 + '%22x22/fvwm-crystal/applications-development.png%$[gt.Developer menu]' Popup /Developer
 + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.About FVWM-Crystal]' Include components/functions/About
 + MissingSubmenuFunction FuncFvwmMenuXephyrDirectory
-+ '%22x22/fvwm-crystal/gdm-xnest.png%$[gt.Nested sessions]' Popup /etc/X11/Sessions
++ '%22x22/fvwm-crystal/gdm-xnest.png%$[gt.Nested sessions]' Popup /usr/share/xsessions
 + '%22x22/fvwm-crystal/system-log-out.png%$[gt.Exit]' Popup /Exit
 # }}}2
 

Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Media	2013-08-31 22:53:13 UTC (rev 545)
@@ -68,7 +68,7 @@
 InfoStoreAdd speed 1
 
 # Decimal point in use (alsaplayer) {{{2
-PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; else echo "InfoStoreRemove dec_point"; fi'
+PipeRead 'if [ "$[infostore.MusicPlayer]" = "alsaplayer" ]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; else echo "InfoStoreRemove dec_point"; fi'
 
 # We must start mplayer in slave mode and send the commands via a pipe
 # Create the pipe if it doesn't exist:

Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Mixer	2013-08-31 22:53:13 UTC (rev 545)
@@ -46,15 +46,15 @@
 # Initialisations {{{1
 # amixer {{{2
 # Set VolControl: Test if a MASTER mixer exist, fallback to PCM
-PipeRead "if [[ $[infostore.Mixer] == amixer ]] ; then NVolControl=`amixer -c $[infostore.SoundCard] get Master \ 2>/dev/null | grep Master -c`; echo InfoStoreAdd VolControl `if [[ $NVolControl == 0 ]]; then echo PCM; else echo Master; fi`; fi"
+PipeRead "if [ $[infostore.Mixer] = amixer ] ; then NVolControl=`amixer -c $[infostore.SoundCard] get Master \ 2>/dev/null | grep Master -c`; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo PCM; else echo Master; fi`; fi"
 
 # Set SnddB: >0 = control in dB
-PipeRead "if [[ $[infostore.Mixer] == amixer ]] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` ; fi"
-PipeRead "if [[ $[infostore.Mixer] != amixer ]] ; then echo InfoStoreAdd SnddB 0 ; fi"
+PipeRead "if [ $[infostore.Mixer] = amixer ] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` \
+    else echo InfoStoreAdd SnddB 0 ; fi"
 
 # aumix {{{2
 # Set VolControl: Test if MASTER mixer exist, fallback to PCM
-PipeRead "if [[ $[infostore.Mixer] == aumix ]] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [[ $NVolControl == 0 ]]; then echo w; else echo v ; fi` ; fi"
+PipeRead "if [ $[infostore.Mixer] = aumix ] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo w; else echo v ; fi` ; fi"
 
 # Memorize the volume
 #PipeRead 'tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"'
@@ -119,40 +119,40 @@
 # If alsamixer or aumix is selected, it will mute toggle too. 
 DestroyFunc Mixer-Volume-Toggle
 AddToFunc Mixer-Volume-Toggle
-+ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
-	if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
-	if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == audacious ]]; then \\
++ I PipeRead 'if [ $[infostore.Mixer] = amixer ]; then \\
+	if [ $[infostore.MixerMute] = 0 ]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = aumix ]; then \\
+	if [ $[infostore.MixerMute] = 0 ]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] = audacious ]; then \\
 	exec audtool playback-playpause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == cdcd ]]; then \\
-	if [[ $[infostore.MixerMuteCdcd] == 0 ]]; then echo "InfoStoreAdd MixerMuteCdcd 1"; exec cdcd pause > /dev/null; else echo "InfoStoreAdd MixerMuteCdcd 0"; cdcd resume > /dev/null; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Musicplayer] ==  cmus ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = cdcd ]; then \\
+	if [ $[infostore.MixerMuteCdcd] = 0 ]; then echo "InfoStoreAdd MixerMuteCdcd 1"; exec cdcd pause > /dev/null; else echo "InfoStoreAdd MixerMuteCdcd 0"; cdcd resume > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.Musicplayer] =  cmus ]; then \\
 	exec cmus-remote --pause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mpd ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  mpd ]; then \\
 	exec mpc toggle > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  quodlibet ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  quodlibet ]; then \\
 	exec quodlibet --play-pause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  xmms2 ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  xmms2 ]; then \\
 	exec xmms2 toggle > /dev/null; fi'
 # the other players
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  alsaplayer ]]; then \\
-	if [[ $[infostore.MixerMuteAP] == 0 ]]; then echo "InfoStoreAdd MixerMuteAP 1";	exec alsaplayer --speed 0; else echo "InfoStoreAdd MixerMuteAP 0"; exec alsaplayer --speed $[infostore.speed]; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mocp ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  alsaplayer ]; then \\
+	if [ $[infostore.MixerMuteAP] = 0 ]; then echo "InfoStoreAdd MixerMuteAP 1";	exec alsaplayer --speed 0; else echo "InfoStoreAdd MixerMuteAP 0"; exec alsaplayer --speed $[infostore.speed]; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  mocp ]; then \\
 	exec mocp --sync --toggle-pause; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mplayer ]]; then \\
-	if [[ $[infostore.MixerMuteMP] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP 1";	echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] ==  mplayer2 ]]; then \\
-	if [[ $[infostore.MixerMuteMP2] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP2 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP2 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  mplayer ]; then \\
+	if [ $[infostore.MixerMuteMP] = 0 ]; then echo "InfoStoreAdd MixerMuteMP 1";	echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] =  mplayer2 ]; then \\
+	if [ $[infostore.MixerMuteMP2] = 0 ]; then echo "InfoStoreAdd MixerMuteMP2 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP2 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
 
 # Mixer volume mute toggle mute {{{2
 # Toggle only alsamixer or aumix if selected. 
 DestroyFunc Mixer-Mute-Toggle
 AddToFunc Mixer-Mute-Toggle
-+ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
-	if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
-	if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = amixer ]; then \\
+	if [ $[infostore.MixerMute] = 0 ]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = aumix ]; then \\
+	if [ $[infostore.MixerMute] = 0 ]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
 +
 
 # Mixer-Volume-dB <value>dB {{{2
@@ -187,7 +187,7 @@
 + '%22x22/fvwm-crystal/mixer-2.png%$[gt.Show main mixer]' Mixer-GUI
 + '%22x22/fvwm-crystal/mixer.png%$[gt.Audio mixer]'		Popup /Preferences/Mixer
 PipeRead 'for i in 0 -3 -6 -9 -12 -15 -18 -24 -30 -36 -42 -48 -54 -60 -100 ; \\
-	do	if [[ $[infostore.SnddB] != 0 ]] ; \\
+	do	if [ $[infostore.SnddB] != 0 ] ; \\
 			then echo \"+ \\\"${i} dB\\\" Mixer-Volume-dB ${i}dB\" ; \\
 		else	case $i in \\
 				0)	vol=100;; \\

Modified: fvwm/components/functions/Xdg-User-Dirs
===================================================================
--- fvwm/components/functions/Xdg-User-Dirs	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Xdg-User-Dirs	2013-08-31 22:53:13 UTC (rev 545)
@@ -6,7 +6,7 @@
 PipeRead 'test ! -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && xdg-user-dirs-update'
 
 # We want them to be globals for the user and with full path
-PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
+PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
 	echo SetEnv XDG_MUSIC_DIR ${XDG_MUSIC_DIR:-$HOME}; \
 	echo SetEnv XDG_VIDEOS_DIR ${XDG_VIDEOS_DIR:-$HOME}; \
 	echo SetEnv XDG_DESKTOP_DIR ${XDG_DESKTOP_DIR:-$HOME/Desktop}; \
@@ -15,4 +15,3 @@
 	echo SetEnv XDG_PUBLICSHARE_DIR ${XDG_PUBLICSHARE_DIR:-$HOME}; \
 	echo SetEnv XDG_DOCUMENTS_DIR ${XDG_DOCUMENTS_DIR:-$HOME}; \
 	echo SetEnv XDG_PICTURES_DIR ${XDG_PICTURES_DIR:-$HOME}'
-

Modified: fvwm/components/functions/Xephyr
===================================================================
--- fvwm/components/functions/Xephyr	2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Xephyr	2013-08-31 22:53:13 UTC (rev 545)
@@ -6,7 +6,7 @@
 DestroyFunc FuncFvwmMenuXephyrDirectory
 AddToFunc FuncFvwmMenuXephyrDirectory
 + I PipeRead 'case "$0" in \
-	"/etc/X11/Sessions"*) myexec="$[FVWM_SYSTEMDIR]/scripts/launchwm $[vp.width] $[vp.height]";; \
+	"/usr/share/xsessions"*) myexec="$[FVWM_SYSTEMDIR]/scripts/launchwm $[vp.width] $[vp.height]";; \
     esac; \
     test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
     test -f "$0"/.media.png && mypng="$0"/.media.png; \

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