Fix stuff for systems without bash as /bin/sh

diff --git a/common/modifier b/common/modifier
index c7b770da57c2154552240d2fc31753e8ef365cb1..cbb89b174cc4878e59b4e878ad320646da636391 100644 (file)
--- 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 8414eef846c0a884bf6db131363a8c416d76eeee..acd270f073984f85bc12bc40e77bd79bd57640c0 100644 (file)
--- 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 958092c6fd9207c3dbb770a142eb305cdf44b1c5..b04f2e63d55ce77a677a59eb724354f47ef5de69 100755 (executable)
--- 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