diff --git a/debian/changelog b/debian/changelog index dcceba6a..d67d4523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,11 @@ screen-profiles (1.48) unreleased; urgency=low * select-screen-profile: remove the ubuntu specific profile handling * screen: fix broken symlinks to ubuntu-* profiles - -- Dustin Kirkland Tue, 21 Apr 2009 14:40:16 -0500 + * screen: default to the light profile, if unspecified; this should be + acceptable now that the F9:Menu prompt is always shown, and from there, + any user can easily change their profile + + -- Dustin Kirkland Tue, 21 Apr 2009 14:49:21 -0500 screen-profiles (1.47-0ubuntu1) jaunty; urgency=low diff --git a/screen b/screen index 61acb8e3..24fec1ef 100755 --- a/screen +++ b/screen @@ -22,15 +22,17 @@ # If $HOME/.screenrc exists but $HOME/.screen-profiles/profile does not, # this shows that the user has an existing custom screen configuration, -# and thus we will not bother them with a select-screen-profile prompt. +# and thus we will not force screen-profiles on them. if [ -r "$HOME/.screenrc" -a ! -e "$HOME/.screen-profiles/profile" -a ! -h "$HOME/.screen-profiles/profile" ]; then exec /usr/bin/screen.real -c "$HOME/.screenrc" "$@" exit $? fi +DEFAULT_PROFILE="light" + # Ensure that the user has selected a screen profile profile="$HOME/.screen-profiles/profile" -[ -h "$profile" ] || /usr/bin/select-screen-profile +[ -h "$profile" ] || /usr/bin/select-screen-profile -s "$DEFAULT_PROFILE" # Previously, profiles were prepended with ubuntu-. # This is no longer the case, for cross-distro compatibility. @@ -41,10 +43,10 @@ if [ -h "$profile" -a ! -r "$profile" ]; then if [ -r "$newsrc" ]; then ln -sf "$newsrc" "$profile" else - /usr/bin/select-screen-profile + /usr/bin/select-screen-profile -s "$DEFAULT_PROFILE" fi else - /usr/bin/select-screen-profile + /usr/bin/select-screen-profile -s "$DEFAULT_PROFILE" fi fi