From: Nick Bowler <nbowler@ellipticsemi.com>
Date: Thu, 8 May 2008 15:03:32 +0000 (-0400)
Subject: Fix stuff for systems without bash as /bin/sh
X-Git-Url: https://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/dc39ff1e216d0f6d65baa9f4b1ec8af673f4f4fd

Fix stuff for systems without bash as /bin/sh
---

diff --git a/common/modifier b/common/modifier
index c7b770d..cbb89b1 100644
--- a/common/modifier
+++ b/common/modifier
@@ -13,4 +13,4 @@ DestroyFunc Mod_M3Func
 AddToFunc   Mod_M3Func
  + C Lower
  + D Maximize 100 0
- + M PipeRead '. $[FVWM_USERDIR]/scripts/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
+ + M PipeRead 'exec $[FVWM_USERDIR]/scripts/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
diff --git a/common/wallpaper b/common/wallpaper
index 8414eef..acd270f 100644
--- a/common/wallpaper
+++ b/common/wallpaper
@@ -15,7 +15,7 @@ DestroyFunc MakeMenuWallpaper
 AddToFunc   MakeMenuWallpaper
  + I DestroyMenu recreate MenuWallpaper
  + I AddToMenu MenuWallpaper Wallpaper Title
- + I PipeRead '. $[FVWM_USERDIR]/scripts/bgmenu.zsh $[BGROOT] MenuWallpaper'
+ + I PipeRead 'exec $[FVWM_USERDIR]/scripts/bgmenu.zsh $[BGROOT] MenuWallpaper'
 
 DestroyFunc SetWallpaper
 AddToFunc   SetWallpaper
diff --git a/scripts/thumbnail.sh b/scripts/thumbnail.sh
index 958092c..b04f2e6 100755
--- a/scripts/thumbnail.sh
+++ b/scripts/thumbnail.sh
@@ -29,7 +29,7 @@ while [ "${1#--}" != "$1" -a "$1" != "-" ]; do
 done
 [ "$1" = "-" ] && shift
 
-if ! expr match "$size" '^\([0-9]*\(x[0-9]\+\)\?\)$' &>/dev/null; then
+if ! expr match "$size" '^\([0-9]*\(x[0-9]\+\)\?\)$' >/dev/null 2>&1; then
 	echo "invalid size specification: $size" 1>&2
 	exit 1
 fi