blackbox-etc_dir.patch

   1 diff -Nru blackbox-0.65.0/src/blackbox.cc blackbox-0.65.0.new/src/blackbox.cc
   2 --- blackbox-0.65.0/src/blackbox.cc     Sun Aug 25 10:05:45 2002
   3 +++ blackbox-0.65.0.new/src/blackbox.cc Sun Mar 23 17:51:49 2003
   4 @@ -126,9 +126,14 @@
   5
   6    ::blackbox = this;
   7    argv = m_argv;
   8 -  if (! rc) rc = "~/.blackboxrc";
   9 -  rc_file = expandTilde(rc);
  10 -
  11 +
  12 +  char *etc_dir = getenv("ETC_DIR");
  13 +  if (etc_dir) {
  14 +    rc_file = string(etc_dir) + string("/blackboxrc");
  15 +  } else {
  16 +    if (! rc) rc = "~/.blackboxrc";
  17 +    rc_file = expandTilde(rc);
  18 +  }
  19    no_focus = False;
  20
  21    resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0;
  22 diff -Nru blackbox-0.65.0/util/bsetbg blackbox-0.65.0.new/util/bsetbg
  23 --- blackbox-0.65.0/util/bsetbg Thu Aug 29 15:01:42 2002
  24 +++ blackbox-0.65.0.new/util/bsetbg     Sun Mar 23 17:23:34 2003
  25 @@ -64,8 +64,15 @@
  26  me=${0##*/}
  27  version=2.1
  28  copyright="(c) 2000-$(date +%Y) by Timothy M. King (http://lordzork.com/)"
  29 -config=$HOME/.bsetbgrc
  30 -last_cmd_file=$HOME/.bsetbg_last_cmd
  31 +
  32 +if [ "x$ETC_DIR" != "x" ]
  33 +then
  34 +       config=$ETC_DIR/bsetbgrc
  35 +       last_cmd_file=$ETC_DIR/bsetbg_last_cmd
  36 +else
  37 +       config=$HOME/.bsetbgrc
  38 +       last_cmd_file=$HOME/.bsetbg_last_cmd
  39 +fi
  40  refresh_cmd=xrefresh
  41  p=$me:
  42
  43 @@ -362,7 +369,7 @@
  44                 read_config=1
  45         fi
  46
  47 -       . $HOME/.bsetbgrc 2>/dev/null
  48 +       . $config 2>/dev/null
  49         check_no_exec
  50
  51         full_cmd=$FULL