diff options
author | fluxgen <fluxgen> | 2003-09-29 11:59:35 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-09-29 11:59:35 (GMT) |
commit | 9c3cd9002d89830cc586b1a0d7d977187fa67522 (patch) | |
tree | a1258c4f8915eb4b03c978cf8813ca9b8a44779b /util | |
parent | 039c14a1c0f610e14de4fa7b82f429418f6c32d4 (diff) | |
download | fluxbox_paul-9c3cd9002d89830cc586b1a0d7d977187fa67522.zip fluxbox_paul-9c3cd9002d89830cc586b1a0d7d977187fa67522.tar.bz2 |
update from Han
Diffstat (limited to 'util')
-rw-r--r-- | util/fbsetbg | 10 | ||||
-rwxr-xr-x | util/fluxbox-generate_menu | 4 | ||||
-rwxr-xr-x | util/startfluxbox.in | 11 |
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 @@ | |||
23 | # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 23 | # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
24 | # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 24 | # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
25 | # | 25 | # |
26 | # $Id: fbsetbg,v 1.19 2003/09/20 16:03:30 fluxgen Exp $ | 26 | # $Id: fbsetbg,v 1.20 2003/09/29 11:59:35 fluxgen Exp $ |
27 | 27 | ||
28 | # Portability notes: | 28 | # Portability notes: |
29 | # To guarantee this script works on all platforms that support fluxbox | 29 | # To guarantee this script works on all platforms that support fluxbox |
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | 46 | ||
47 | # The wallpapersetter is selected in this order | 47 | # The wallpapersetter is selected in this order |
48 | wpsetters='feh Esetroot wmsetbg chbg display qiv xv xsri xli xsetbg' # broken icewmbg' | 48 | wpsetters='Esetroot wmsetbg feh chbg display qiv xv xsri xli xsetbg' # broken icewmbg' |
49 | lastwallpaper=${HOME}/.fluxbox/lastwallpaper | 49 | lastwallpaper=${HOME}/.fluxbox/lastwallpaper |
50 | 50 | ||
51 | 51 | ||
@@ -346,6 +346,6 @@ Run '$WPSETTER $option "$wallpaper"' from an xterm to find out what." | |||
346 | fi | 346 | fi |
347 | 347 | ||
348 | #remember previous wallpaper | 348 | #remember previous wallpaper |
349 | [ ! "$remember" = false ] && remembercommand | 349 | if [ ! "$remember" = false ]; then |
350 | # Off course this returns 1 most of the time. | 350 | remembercommand |
351 | exit 0 | 351 | 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 @@ | |||
22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | # DEALINGS IN THE SOFTWARE. | 23 | # DEALINGS IN THE SOFTWARE. |
24 | # | 24 | # |
25 | # $Id: fluxbox-generate_menu,v 1.52 2003/09/22 18:45:31 fluxgen Exp $ | 25 | # $Id: fluxbox-generate_menu,v 1.53 2003/09/29 11:59:35 fluxgen Exp $ |
26 | 26 | ||
27 | # | 27 | # |
28 | # Portability notes: | 28 | # Portability notes: |
@@ -910,7 +910,7 @@ append_submenu "${FBSETTINGSMENU}" | |||
910 | # Backgroundmenu | 910 | # Backgroundmenu |
911 | addbackground() { | 911 | addbackground() { |
912 | picturename=`basename "$1"` | 912 | picturename=`basename "$1"` |
913 | append "[exec] (${picturename%.???}) {fbsetbg -f \"$1\" }" | 913 | append "[exec] (${picturename%.???}) {fbsetbg -a \"$1\" }" |
914 | } | 914 | } |
915 | 915 | ||
916 | if [ "$BACKGROUNDMENUITEM" = yes ]; then | 916 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | if [ -e ~/.fluxbox/startup ];then | 2 | # $Id: startfluxbox.in,v 1.2 2003/09/29 11:59:35 fluxgen Exp $ |
3 | if [ -x ~/.fluxbox/startup ];then | ||
4 | exec ~/.fluxbox/startup | ||
5 | elif [ -r ~/.fluxbox/startup ]; then | ||
3 | exec sh ~/.fluxbox/startup | 6 | exec sh ~/.fluxbox/startup |
4 | else | 7 | else |
5 | if [ ! -d ~/.fluxbox ];then | 8 | if [ ! -d ~/.fluxbox ];then |
6 | mkdir -p ~/.fluxbox/{backgrounds,styles} | 9 | mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} |
7 | fi | 10 | fi |
8 | cp @pkgdatadir@/startup ~/.fluxbox | 11 | cp @pkgdatadir@/startup ~/.fluxbox |
9 | @pkgbindir@/bsetroot -solid Black | 12 | chmod 755 ~/.fluxbox/startup |
10 | exec @pkgbindir@/fluxbox | 13 | exec ~/.fluxbox/startup |
11 | fi | 14 | fi |