* profiles/plain: renamed to NONE to more clearly convey the fact that

if you choose this profile, you are not, in fact, using a supplied
    screen-profile; correct broken symlinks in the 'screen' script
  * select-screen-profile: set the default, recommended, simple profile
    to 'light'

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland 2009-04-23 17:01:13 -05:00
commit 702cb94605
6 changed files with 14 additions and 6 deletions

7
debian/changelog vendored
View file

@ -4,8 +4,13 @@ screen-profiles (1.50) unreleased; urgency=low
carriage return to the F5-refresh keybinding carriage return to the F5-refresh keybinding
* keybindings/common, doc/help.txt: change F8 from advanced help to * keybindings/common, doc/help.txt: change F8 from advanced help to
window re-titling (over time, this is far more useful than adv help) window re-titling (over time, this is far more useful than adv help)
* profiles/plain: renamed to NONE to more clearly convey the fact that
if you choose this profile, you are not, in fact, using a supplied
screen-profile; correct broken symlinks in the 'screen' script
* select-screen-profile: set the default, recommended, simple profile
to 'light'
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 23 Apr 2009 16:20:15 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 23 Apr 2009 16:59:59 -0500
screen-profiles (1.49-0ubuntu1) jaunty; urgency=low screen-profiles (1.49-0ubuntu1) jaunty; urgency=low

2
debian/install vendored
View file

@ -1,7 +1,7 @@
bin/* var/lib/screen-profiles bin/* var/lib/screen-profiles
po/locale/* usr/share/locale po/locale/* usr/share/locale
profiles/common usr/share/screen-profiles/profiles profiles/common usr/share/screen-profiles/profiles
profiles/plain usr/share/screen-profiles/profiles profiles/NONE usr/share/screen-profiles/profiles
profiles/black usr/share/screen-profiles/profiles profiles/black usr/share/screen-profiles/profiles
profiles/dark usr/share/screen-profiles/profiles profiles/dark usr/share/screen-profiles/profiles
profiles/light usr/share/screen-profiles/profiles profiles/light usr/share/screen-profiles/profiles

View file

@ -2,11 +2,12 @@
# Screen Profile # Screen Profile
# This configuration profile is the most basic, plain profile, # This configuration profile is the most basic, plain profile,
# (the default one that ships with screen). # (the default one that ships with screen).
# To clarify that this *disables* screen profiles, let's call this profile
# "NONE".
# #
# Copyright (C) 2008 Canonical Ltd. # Copyright (C) 2008 Canonical Ltd.
# #
# Authors: Dustin Kirkland <kirkland@canonical.com> # Authors: Dustin Kirkland <kirkland@canonical.com>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

2
screen
View file

@ -45,6 +45,8 @@ if [ -h "$profile" -a ! -r "$profile" ]; then
else else
/usr/bin/select-screen-profile -s "$DEFAULT_PROFILE" /usr/bin/select-screen-profile -s "$DEFAULT_PROFILE"
fi fi
elif stat "$profile" | head -n1 | grep -qs ".*->.*plain'$"; then
ln -sf "/usr/share/screen-profiles/profiles/NONE" "$profile"
else else
/usr/bin/select-screen-profile -s "$DEFAULT_PROFILE" /usr/bin/select-screen-profile -s "$DEFAULT_PROFILE"
fi fi

View file

@ -21,7 +21,7 @@ PROG="screen-profiles"
SHARE="/usr/share/$PROG" SHARE="/usr/share/$PROG"
DIR=`mktemp -t -d screen-profiles.XXXXXXXX` || error "Could not create a temporary directory" DIR=`mktemp -t -d screen-profiles.XXXXXXXX` || error "Could not create a temporary directory"
# Grab list of available colors # Grab list of available colors
colors=`find $SHARE/profiles/ -type f | sed "s/^.*\///" | sed "s/^.*-//" | sort -u | egrep -v "common|plain"` colors=`find $SHARE/profiles/ -type f | sed "s/^.*\///" | sed "s/^.*-//" | sort -u | egrep -v "common|plain|NONE"`
# Make sure we clean up $DIR if we exit for any reason # Make sure we clean up $DIR if we exit for any reason
trap "rm -rf "$DIR" 2>/dev/null || true" EXIT HUP INT QUIT TERM trap "rm -rf "$DIR" 2>/dev/null || true" EXIT HUP INT QUIT TERM

View file

@ -57,7 +57,7 @@ assert_symlink "$HOME/.screen-profiles/profile"
listprofiles() { listprofiles() {
# Display list of profiles, one per line # Display list of profiles, one per line
# Start with basic profiles # Start with basic profiles
basename $(ls $PROFILE_DIR/plain 2>/dev/null) 2>/dev/null basename $(ls $PROFILE_DIR/NONE 2>/dev/null) 2>/dev/null
basename $(ls $PROFILE_DIR/light 2>/dev/null) 2>/dev/null basename $(ls $PROFILE_DIR/light 2>/dev/null) 2>/dev/null
basename $(ls $PROFILE_DIR/dark 2>/dev/null) 2>/dev/null basename $(ls $PROFILE_DIR/dark 2>/dev/null) 2>/dev/null
basename $(ls $PROFILE_DIR/black 2>/dev/null) 2>/dev/null basename $(ls $PROFILE_DIR/black 2>/dev/null) 2>/dev/null
@ -81,7 +81,7 @@ prompt() {
for x in $profiles; do for x in $profiles; do
i=$(expr $i + 1) i=$(expr $i + 1)
desc=" " desc=" "
if [ "$x" = "plain" ]; then if [ "$x" = "light" ]; then
simple=$i simple=$i
fi fi
[ $i -lt 10 ] && i=" $i" [ $i -lt 10 ] && i=" $i"