From 6443914f4234cb6d29a2e7d0d24ac6293f998e57 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 29 Sep 2007 00:14:29 +0200 Subject: [PATCH] Restore original behaviour of screen config, add some more header information --- debian/changelog | 13 ++++++++----- etc/apt/hg-snapshot-script | 3 ++- etc/grml/screen_multisession | 10 ++++++++++ etc/grml/screenrc | 14 +++++++------- etc/grml/screenrc_acpi | 16 ++++++++-------- etc/grml/screenrc_generic | 14 +++++++------- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45f5a8e..e638bfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,11 +3,14 @@ grml-etc-core (0.3.31) unstable; urgency=low * /etc/skel/.zshrc: use same pattern in function wikien as in wikide. (Thanks, wuehlmaus) * Added /etc/apt/apt.conf.example + /etc/apt/hg-snapshot-script - * /etc/grml/screenrc*: switch caption and hardstatus for better - use with splitted windows; thanks to Alexander 'z3ttacht' Steinböck - for the patch! [Closes: issue300] - * /etc/grml/screenrc_acpi: fix usage of yacpi, thanks to - Alexander 'z3ttacht' Steinböck for the patch! [Closes: issue301] + * Added /etc/grml/screenrc_generic which should work on any OS without + any grml/Debian specific programs/scripts. + * /etc/grml/screenrc*: + - provide example for switching caption and hardstatus for better + use with splitted windows; thanks to Alexander 'z3ttacht' Steinböck + for the patch! [Closes: issue300] + - improve usage of yacpi, thanks to Alexander 'z3ttacht' Steinböck for + the initial patch! [Closes: issue301] -- Michael Prokop Wed, 26 Sep 2007 22:48:07 +0200 diff --git a/etc/apt/hg-snapshot-script b/etc/apt/hg-snapshot-script index 2ed1205..83119b0 100755 --- a/etc/apt/hg-snapshot-script +++ b/etc/apt/hg-snapshot-script @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mit Sep 26 22:51:31 CEST 2007 [mika] +# Latest change: Sam Sep 29 00:14:00 CEST 2007 [mika] ################################################################################ # Basic instructions: # ------------------- @@ -19,6 +19,7 @@ # (^)blkid.tab(|.old) # (^)mtab # (^)adjtime +# \..*.swp # # add other files if necessary, depends on your setup... # EOF # diff --git a/etc/grml/screen_multisession b/etc/grml/screen_multisession index d81e8e1..e91e776 100644 --- a/etc/grml/screen_multisession +++ b/etc/grml/screen_multisession @@ -1,3 +1,11 @@ +# Filename: /etc/grml/screen_multisession +# Purpose: configuration file for use in multisession mode of GNU screen +# Authors: grml-team (grml.org), (c) Michael Prokop +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2 or any later version. +# Latest change: Sam Sep 29 00:08:48 CEST 2007 [mika] +################################################################################ + # who is allowed to connect via multiuser-mode? addacl root,grml @@ -10,3 +18,5 @@ escape ^Bb # no nag-screen, please startup_message off + +## END OF FILE ################################################################# diff --git a/etc/grml/screenrc b/etc/grml/screenrc index 8fab37f..f9dbd0f 100644 --- a/etc/grml/screenrc +++ b/etc/grml/screenrc @@ -1,19 +1,19 @@ -# Filename: screenrc -# Purpose: config file for GNU screen +# Filename: /etc/grml/screenrc +# Purpose: main configuration file for GNU screen # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Sep 28 23:35:32 CEST 2007 [mika] +# Latest change: Sam Sep 29 00:11:22 CEST 2007 [mika] ################################################################################ backtick 1 0 60 /usr/bin/cpu-screen backtick 2 0 60 /usr/bin/ip-screen - caption always "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}net: %2`) %-21=%{kw}%D %d.%m.%Y %0c" - hardstatus alwayslastline "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" + caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`) %-21=%{wk}%D %d.%m.%Y %0c" + hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # switch order of caption and hardstatus: -# hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}net: %2`) %-21=%{kw}%D %d.%m.%Y %0c" -# caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" +# hardstatus alwayslastline "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`) %-21=%{wk}%D %d.%m.%Y %0c" +# caption always "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # detach on hangup autodetach on # default: on diff --git a/etc/grml/screenrc_acpi b/etc/grml/screenrc_acpi index f3b5e76..2c73e9c 100644 --- a/etc/grml/screenrc_acpi +++ b/etc/grml/screenrc_acpi @@ -1,19 +1,19 @@ -# Filename: screenrc -# Purpose: config file for GNU screen +# Filename: /etc/grml/screenrc_acpi +# Purpose: configuration file for GNU screen providing ACPI output # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Sep 28 23:35:39 CEST 2007 [mika] +# Latest change: Sam Sep 29 00:10:54 CEST 2007 [mika] ################################################################################ backtick 1 60 60 /usr/bin/cpu-screen - backtick 2 60 60 /usr/bin/yacpi -p -t - caption always "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}acpi: %2`) %-21=%{kw}%D %d.%m.%Y %0c" - hardstatus alwayslastline "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" + backtick 2 60 60 /usr/bin/yacpi -b -p -t + caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}acpi: %2`) %-21=%{wk}%D %d.%m.%Y %0c" + hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # switch order of caption and hardstatus: -# caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" -# hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}acpi: %2`) %-21=%{kw}%D %d.%m.%Y %0c" +# hardstatus alwayslastline "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}acpi: %2`) %-21=%{wk}%D %d.%m.%Y %0c" +# caption always "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # detach on hangup autodetach on # default: on diff --git a/etc/grml/screenrc_generic b/etc/grml/screenrc_generic index aa4799c..77dd119 100644 --- a/etc/grml/screenrc_generic +++ b/etc/grml/screenrc_generic @@ -1,17 +1,17 @@ -# Filename: screenrc -# Purpose: config file for GNU screen +# Filename: /etc/grml/screenrc_generic +# Purpose: generic configuration file for GNU screen # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Sep 28 23:35:53 CEST 2007 [mika] +# Latest change: Sam Sep 29 00:10:47 CEST 2007 [mika] ################################################################################ - caption always "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr}) %-21=%{kw}%D %d.%m.%Y %0c" - hardstatus alwayslastline "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" + caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l) %-21=%{wk}%D %d.%m.%Y %0c" + hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # switch order of caption and hardstatus: -# hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr}) %-21=%{kw}%D %d.%m.%Y %0c" -# caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" +# hardstatus alwayslastline "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`) %-21=%{wk}%D %d.%m.%Y %0c" +# caption always "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" # detach on hangup autodetach on # default: on -- 2.1.4