From e1c5396b699c6696acb7ad2cf4d7353a4f430af9 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 23 Jun 2009 02:21:33 -0500 Subject: [PATCH] * byobu-config, byobu-janitor, byobu-select-profile, debian/install, debian/rules, po/POTFILES.sh, rpm/byobu.spec: rename select-screen-profile to byobu-select-profile; fits our namespace better Signed-off-by: Dustin Kirkland --- byobu-config | 4 ++-- byobu-janitor | 4 ++-- select-screen-profile => byobu-select-profile | 4 ++-- select-screen-profile.1 => byobu-select-profile.1 | 0 debian/changelog | 5 ++++- debian/install | 2 +- debian/rules | 2 +- po/POTFILES.sh | 2 +- rpm/byobu.spec | 4 ++-- 9 files changed, 15 insertions(+), 12 deletions(-) rename select-screen-profile => byobu-select-profile (97%) rename select-screen-profile.1 => byobu-select-profile.1 (100%) diff --git a/byobu-config b/byobu-config index 4cdf7b2f..7dea3b15 100755 --- a/byobu-config +++ b/byobu-config @@ -136,7 +136,7 @@ def help(screen, size, config): def profile(screen, size): li = Listbox(height = 8, width = 60, scroll = 1, returnExit = 1) - for choice in commands.getoutput('select-screen-profile -l').splitlines(): + for choice in commands.getoutput('byobu-select-profile -l').splitlines(): li.append(choice, choice) bb = ButtonBar(screen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact = 1) @@ -146,7 +146,7 @@ def profile(screen, size): g.add(bb, 0, 1, padding=(1,1,0,0)) if bb.buttonPressed(g.runOnce()) != "cancel": - commands.getoutput('select-screen-profile --set %s' % li.current()) + commands.getoutput('byobu-select-profile --set %s' % li.current()) reload_required() button = messagebox(screen, 60, 4, _("Message"), _(RELOAD), \ buttons=((_("Menu"), ))) diff --git a/byobu-janitor b/byobu-janitor index 63ccd393..6af4e339 100644 --- a/byobu-janitor +++ b/byobu-janitor @@ -45,14 +45,14 @@ if [ -d "$HOME/.$OLDPKG" ] && [ ! -e "$HOME/.$PKG" ]; then # Determine the chosen profile color profile=`readlink "$PROFILE" | sed "s:^.*-::"` # Try to set that color, if it exists, otherwise set to default - select-screen-profile -s "$profile" >/dev/null 2>&1 || select-screen-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1 + byobu-select-profile -s "$profile" >/dev/null 2>&1 || byobu-select-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1 fi fi # Affects: First runs with no configuration # Seed the configuration [ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG" -[ -r "$PROFILE" ] || select-screen-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1 +[ -r "$PROFILE" ] || byobu-select-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1 [ -s "$HOME/.$PKG/keybindings" ] || echo "source /usr/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings" [ -r "$HOME/.$PKG/status" ] || touch "$HOME/.$PKG/status" [ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows" diff --git a/select-screen-profile b/byobu-select-profile similarity index 97% rename from select-screen-profile rename to byobu-select-profile index 326d56c7..5ddd8361 100755 --- a/select-screen-profile +++ b/byobu-select-profile @@ -1,6 +1,6 @@ #!/bin/sh -e # -# select-screen-profile +# byobu-select-profile # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -28,7 +28,7 @@ TEXTDOMAIN="$PKG" usage () { cat < Tue, 23 Jun 2009 02:05:56 -0500 + -- Dustin Kirkland Tue, 23 Jun 2009 02:21:01 -0500 byobu (2.15-0ubuntu1) karmic; urgency=low diff --git a/debian/install b/debian/install index 662118e4..b5420d50 100644 --- a/debian/install +++ b/debian/install @@ -9,7 +9,7 @@ profiles/light usr/share/byobu/profiles keybindings/* usr/share/byobu/keybindings statusrc etc/byobu windows/common usr/share/byobu/windows -select-screen-profile usr/bin +byobu-select-profile usr/bin byobu usr/bin byobu-config usr/bin byobu-status usr/bin diff --git a/debian/rules b/debian/rules index 6b339835..01bc3f91 100755 --- a/debian/rules +++ b/debian/rules @@ -59,7 +59,7 @@ binary-indep: build install dh_testdir -i dh_testroot -i dh_installdocs -X.bzr -i - dh_installman -i screen-launcher.1 byobu.1 byobu-config.1 select-screen-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1 + dh_installman -i screen-launcher.1 byobu.1 byobu-config.1 byobu-select-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1 dh_installchangelogs -i dh_installdebconf -i dh_compress -i diff --git a/po/POTFILES.sh b/po/POTFILES.sh index 36eb30e4..7550bf39 100644 --- a/po/POTFILES.sh +++ b/po/POTFILES.sh @@ -2,4 +2,4 @@ # Please keep this file sorted alphabetically. bin/menu byobu-export -select-screen-profile +byobu-select-profile diff --git a/rpm/byobu.spec b/rpm/byobu.spec index 5e238862..b8e2dbb6 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -69,7 +69,7 @@ cp -ar profiles/light ${RPM_BUILD_ROOT}/usr/share/byobu/profiles cp -ar keybindings/common ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings cp -ar keybindings/none ${RPM_BUILD_ROOT}/usr/share/byobu/keybindings cp -ar windows/common ${RPM_BUILD_ROOT}/usr/share/byobu/windows -cp -ar select-screen-profile ${RPM_BUILD_ROOT}/usr/bin +cp -ar byobu-select-profile ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu-config ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu-status ${RPM_BUILD_ROOT}/usr/bin @@ -95,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/byobu-export /usr/bin/byobu-status /usr/bin/byobu-status-detail -/usr/bin/select-screen-profile +/usr/bin/byobu-select-profile /usr/lib/byobu/arch /usr/lib/byobu/battery /usr/lib/byobu/cpu_count