update from Han

3 files changed, 14 insertions, 11 deletions

diff --git a/util/fbsetbg b/util/fbsetbg
index b72c7cc..4cd0ab3 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -23,7 +23,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# $Id: fbsetbg,v 1.19 2003/09/20 16:03:30 fluxgen Exp $
+# $Id: fbsetbg,v 1.20 2003/09/29 11:59:35 fluxgen Exp $
 
 # Portability notes:
 # To guarantee this script works on all platforms that support fluxbox
@@ -45,7 +45,7 @@
 
 
 # The wallpapersetter is selected in this order
-wpsetters='feh Esetroot wmsetbg chbg display qiv xv xsri xli xsetbg' # broken icewmbg'
+wpsetters='Esetroot wmsetbg feh chbg display qiv xv xsri xli xsetbg' # broken icewmbg'
 lastwallpaper=${HOME}/.fluxbox/lastwallpaper
 
 
@@ -346,6 +346,6 @@ Run '$WPSETTER $option "$wallpaper"' from an xterm to find out what."
 fi
 
 #remember previous wallpaper
-[ ! "$remember" = false ] && remembercommand
-# Off course this returns 1 most of the time.
-exit 0
+if [ ! "$remember" = false ]; then
+    remembercommand
+fi
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index e2a74e9..cc1c986 100755
--- a/util/fluxbox-generate_menu
+++ b/util/fluxbox-generate_menu
@@ -22,7 +22,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-# $Id: fluxbox-generate_menu,v 1.52 2003/09/22 18:45:31 fluxgen Exp $
+# $Id: fluxbox-generate_menu,v 1.53 2003/09/29 11:59:35 fluxgen Exp $
 
 #
 # Portability notes:
@@ -910,7 +910,7 @@ append_submenu "${FBSETTINGSMENU}"
     # Backgroundmenu
     addbackground() {
                 picturename=`basename "$1"`
-                append "[exec] (${picturename%.???}) {fbsetbg -f \"$1\" }"
+                append "[exec] (${picturename%.???}) {fbsetbg -a \"$1\" }"
     }
 
     if [ "$BACKGROUNDMENUITEM" = yes ]; then
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index f3ba2f9..8e9daeb 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -1,11 +1,14 @@
 #!/bin/sh
-if [ -e ~/.fluxbox/startup ];then
+# $Id: startfluxbox.in,v 1.2 2003/09/29 11:59:35 fluxgen Exp $
+if [ -x ~/.fluxbox/startup ];then
+    exec ~/.fluxbox/startup
+elif [ -r ~/.fluxbox/startup ]; then
     exec sh ~/.fluxbox/startup
 else
     if [ ! -d ~/.fluxbox ];then
-        mkdir -p ~/.fluxbox/{backgrounds,styles}
+        mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps}
     fi
     cp @pkgdatadir@/startup ~/.fluxbox
-    @pkgbindir@/bsetroot -solid Black
-    exec @pkgbindir@/fluxbox
+    chmod 755 ~/.fluxbox/startup
+    exec ~/.fluxbox/startup
 fi