diff --git a/bin/cpu-count b/bin/cpu-count index d44bb71e..ae8f9d4e 100755 --- a/bin/cpu-count +++ b/bin/cpu-count @@ -4,5 +4,5 @@ count=`grep -c "^processor.*:" /proc/cpuinfo` if [ "$count" = "1" ]; then echo else - echo "$count x " + echo $count"x " fi diff --git a/bin/release b/bin/release index 56257ada..73c2eb94 100755 --- a/bin/release +++ b/bin/release @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/lsb_release -d -s +/usr/bin/lsb_release -d -s | sed 's/\s*(.*)$//' diff --git a/debian/changelog b/debian/changelog index bf3762f2..ec2b6485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ screen-profiles (1.3) UNRELEASED; urgency=low - * + [ Dustin Kirkland ] + * doc/help.txt: Updated to reflect new F-key mappings + * keybindings/common: Map F6 to detach session + * select-screen-profile: Test link against arg + * bin/cpu-count: remove whitespace + * bin/release: get rid of "(development branch)" string - -- Dustin Kirkland Tue, 06 Jan 2009 19:46:35 -0600 + -- Dustin Kirkland Wed, 07 Jan 2009 12:39:57 -0600 screen-profiles (1.2-0ubuntu1) jaunty; urgency=low diff --git a/doc/help.txt b/doc/help.txt index aeda4586..ca782c94 100644 --- a/doc/help.txt +++ b/doc/help.txt @@ -1,17 +1,16 @@ -Screen is a powerful program that allows your terminal session to have -multiple windows and retain context between multiple logins. This -version of screen is configured with a task bar at the bottom of the -window that shows system status, pending updates, and which window you -are currently viewing. +Screen is a powerful program that allows your terminal session to use +multiple windows and retain context among multiple logins. +This version of screen is configured with a task bar at the bottom of +the window that shows system status, pending updates, and which window +you are currently viewing. -Common mappings (where C- means ctrl): ------------------------------------------------------------------------- -C-PgUp/Shift-Tab Goto next window | F1 Basic help (this) -C-PgDown Goto previous window | F2 Advanced help -C-Shift-Del Detach screen | F4 Create new window -C-g Esc Use scrollback (Esc exits) | F6 Close current window ------------------------------------------------------------------------- +Key mappings: +F2 Create new window | F6 Detach from session +F3 Go to prev window | F7 -- +F4 Go to next window | F8 Advanced help +F5 Close this window | F9 Basic help (this) -Use 'screen -r' to reattach to a detached screen. Complete help on -screen can be obtained using the 'man screen' command. Please note that -screen is configured to remap the escape prefix from ctrl-A to ctrl-G. +Commands: +'screen -r' - reattach | 'man screen' - complete help + +Note that the escape key has been changed from to . diff --git a/keybindings/common b/keybindings/common index cce487e0..2b884d17 100644 --- a/keybindings/common +++ b/keybindings/common @@ -39,7 +39,7 @@ bindkey -k k2 process n # F2 | Create new window (and name it) bindkey -k k3 prev # F3 | Previous Window bindkey -k k4 next # F4 | Next Window bindkey -k k5 kill # F5 | Close window - # F6 +bindkey -k k6 detach # F6 | Detach from this session # F7 bindkey -k k8 help # F8 | Advanced help/keybindings bindkey -k k9 screen -t help 0 screen-profiles-helper # F9 | Welcome screen diff --git a/select-screen-profile b/select-screen-profile index a81d2acc..4f93191f 100755 --- a/select-screen-profile +++ b/select-screen-profile @@ -43,7 +43,7 @@ selected=-1 assert_symlink() { if [ -e "$1" ]; then - if [ ! -L "$HOME/.screenrc-profile" ]; then + if [ ! -L "$1" ]; then echo `gettext 'Error:'` $1 `gettext ' file exists, but is not a symlink'` exit 1 fi