update from Han

This commit is contained in:
fluxgen 2003-09-29 11:59:35 +00:00
parent 039c14a1c0
commit 9c3cd9002d
3 changed files with 14 additions and 11 deletions

View file

@ -23,7 +23,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # 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: # Portability notes:
# To guarantee this script works on all platforms that support fluxbox # To guarantee this script works on all platforms that support fluxbox
@ -45,7 +45,7 @@
# The wallpapersetter is selected in this order # 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 lastwallpaper=${HOME}/.fluxbox/lastwallpaper
@ -346,6 +346,6 @@ Run '$WPSETTER $option "$wallpaper"' from an xterm to find out what."
fi fi
#remember previous wallpaper #remember previous wallpaper
[ ! "$remember" = false ] && remembercommand if [ ! "$remember" = false ]; then
# Off course this returns 1 most of the time. remembercommand
exit 0 fi

View file

@ -22,7 +22,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # 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: # Portability notes:
@ -910,7 +910,7 @@ append_submenu "${FBSETTINGSMENU}"
# Backgroundmenu # Backgroundmenu
addbackground() { addbackground() {
picturename=`basename "$1"` picturename=`basename "$1"`
append "[exec] (${picturename%.???}) {fbsetbg -f \"$1\" }" append "[exec] (${picturename%.???}) {fbsetbg -a \"$1\" }"
} }
if [ "$BACKGROUNDMENUITEM" = yes ]; then if [ "$BACKGROUNDMENUITEM" = yes ]; then

View file

@ -1,11 +1,14 @@
#!/bin/sh #!/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 exec sh ~/.fluxbox/startup
else else
if [ ! -d ~/.fluxbox ];then if [ ! -d ~/.fluxbox ];then
mkdir -p ~/.fluxbox/{backgrounds,styles} mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps}
fi fi
cp @pkgdatadir@/startup ~/.fluxbox cp @pkgdatadir@/startup ~/.fluxbox
@pkgbindir@/bsetroot -solid Black chmod 755 ~/.fluxbox/startup
exec @pkgbindir@/fluxbox exec ~/.fluxbox/startup
fi fi