aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-20 11:23:51 (GMT)
committerrathnor <rathnor>2003-07-20 11:23:51 (GMT)
commit8500132b0a05d22470e63cee1d16191ecb138ecf (patch)
tree81ebbb747b4fdca741a23f6e2f64d79b35065f10
parent93b3d7e6c589e49c85e1b037840c117357d90e42 (diff)
downloadfluxbox-8500132b0a05d22470e63cee1d16191ecb138ecf.zip
fluxbox-8500132b0a05d22470e63cee1d16191ecb138ecf.tar.bz2
more updates from han
-rw-r--r--util/fbsetbg20
1 files changed, 10 insertions, 10 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index f72fb64..9a22cab 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.11 2003/07/20 10:58:27 rathnor Exp $ 26# $Id: fbsetbg,v 1.12 2003/07/20 11:23:51 rathnor Exp $
27 27
28# 28#
29# Portability notes: 29# Portability notes:
@@ -49,14 +49,14 @@ WHOAMI=`whoami`
49 49
50# Functions 50# Functions
51display_usage() { 51display_usage() {
52 cat <<EOF 52 cat << EOF
53Usage: fbsetbg [ -fcta /path/to/wallpaper ] [ -l ] [ -h ] [ -d ] 53Usage: fbsetbg [ -fcta /path/to/wallpaper ] [ -l ] [ -h ] [ -d ]
54EOF 54EOF
55} 55}
56 56
57display_help() { 57display_help() {
58 display_usage 58 display_usage
59 cat <<EOF 59 cat << EOF
60 60
61Options: 61Options:
62 62
@@ -82,11 +82,11 @@ EOF
82} 82}
83 83
84display_tips(){ 84display_tips(){
85cat<<EOF 85cat<< EOF
86 86
87To replace all occurrences of bsetbg in a file use this command: 87To replace all occurrences of bsetbg in a file use this command:
88 88
89 perl -pi -e 's,([^f]|^)bsetbg,fbsetbg,' 89 perl -pi -e 's,([^f]|^)bsetbg,fbsetbg,' filename
90 90
91If you want the style to set the wallpaper and you want fbsetbg to 91If you want the style to set the wallpaper and you want fbsetbg to
92remember the previous wallpaper put this in your ~/.fluxbox/init 92remember the previous wallpaper put this in your ~/.fluxbox/init
@@ -245,9 +245,9 @@ case "${COMMAND_LINE_ARGUMENT}" in
245 wallpaper=$OPTARG 245 wallpaper=$OPTARG
246 ;; 246 ;;
247 l) 247 l)
248 if [ -r $lastwallpaper ];then 248 if [ -r $lastwallpaper ]; then
249 option=`grep "${DISPLAY}$" $lastwallpaper|cut -d'|' -f1` 249 option=`grep "|${DISPLAY}$" $lastwallpaper|cut -d'|' -f1`
250 wallpaper=`grep "${DISPLAY}$" $lastwallpaper|cut -d'|' -f2` 250 wallpaper=`grep "|${DISPLAY}$" $lastwallpaper|cut -d'|' -f2`
251 else 251 else
252 message 'No previous wallpaper recorded. You have never used fbsetbg before.' 252 message 'No previous wallpaper recorded. You have never used fbsetbg before.'
253 exit 1 253 exit 1
@@ -266,7 +266,7 @@ case "${COMMAND_LINE_ARGUMENT}" in
266 display_usage 266 display_usage
267 exit 1 267 exit 1
268 fi 268 fi
269 if [ -z "$1" ];then 269 if [ -z "$1" ]; then
270 message 'No wallpaper to set' >&2 270 message 'No wallpaper to set' >&2
271 display_usage 271 display_usage
272 exit 1 272 exit 1
@@ -278,7 +278,7 @@ option=${option:=$full}
278wallpaper=${wallpaper:=$1} 278wallpaper=${wallpaper:=$1}
279 279
280 280
281if [ ! -r "$wallpaper" ];then 281if [ ! -r "$wallpaper" ]; then
282 message "Can't find wallpaper $wallpaper" 282 message "Can't find wallpaper $wallpaper"
283 exit 1 283 exit 1
284fi 284fi