diff --git a/byobu-config b/byobu-config index 7dea3b15..c004cf33 100755 --- a/byobu-config +++ b/byobu-config @@ -395,7 +395,7 @@ def defaultwindows(screen, size): def install(screen, size, isInstalled): if not isInstalled: - out = commands.getoutput("bash /usr/share/"+PKG+"/screen-launcher-install") + out = commands.getoutput("bash /usr/share/"+PKG+"/byobu-launcher-install") if out == "": out = _("Byobu will be launched automatically next time you login.") @@ -403,7 +403,7 @@ def install(screen, size, isInstalled): buttons=((_("Menu"), ))) return 100 else: - out = commands.getoutput("bash /usr/share/"+PKG+"/screen-launcher-uninstall") + out = commands.getoutput("bash /usr/share/"+PKG+"/byobu-launcher-uninstall") if out == "": out = _("Byobu will not be used next time you login.") @@ -493,7 +493,7 @@ def main(): config = SafeConfigParser() - isInstalled = (commands.getoutput('grep screen-launcher '+(HOME+'/.profile')) != "") + isInstalled = (commands.getoutput('grep byobu-launcher '+(HOME+'/.profile')) != "") tag = 100 diff --git a/screen-launcher b/byobu-launcher similarity index 98% rename from screen-launcher rename to byobu-launcher index 92a9a25b..b33354a2 100755 --- a/screen-launcher +++ b/byobu-launcher @@ -1,6 +1,6 @@ #!/bin/sh -e # -# screen-launcher +# byobu-launcher # Copyright (C) 2008 Canonical Ltd. # # Authors: Nick Barcet diff --git a/screen-launcher-install b/byobu-launcher-install similarity index 84% rename from screen-launcher-install rename to byobu-launcher-install index 30a177d9..f1240ec2 100755 --- a/screen-launcher-install +++ b/byobu-launcher-install @@ -1,6 +1,6 @@ #!/bin/sh -e # -# screen-launcher-install +# byobu-launcher-install # Copyright (C) 2008 Canonical Ltd. # # Authors: Nick Barcet @@ -20,9 +20,9 @@ PKG="byobu" -install_screen_launcher() { +install_launcher() { dest=$1 - launcher="screen-launcher" + launcher="byobu-launcher" launcher_line="\`echo \$- | grep -qs i\` && $launcher" # Add it at the end echo "$launcher_line" >> "$dest" @@ -31,20 +31,20 @@ install_screen_launcher() { } # Sanitize the environment -/usr/share/$PKG/screen-launcher-uninstall || true +/usr/share/$PKG/byobu-launcher-uninstall || true # Install in $HOME/.profile unconditionally -install_screen_launcher "$HOME/.profile" +install_launcher "$HOME/.profile" # Install in zprofile if default shell is zsh if grep -qs "^$USER:.*zsh$" /etc/passwd; then - install_screen_launcher "$HOME/.zprofile" + install_launcher "$HOME/.zprofile" fi # Now, install in any shell-specific profiles, if they exist # This list may grow to support other shells for i in ".bash_profile" ".bash_login"; do if [ -w "$HOME/$i" ]; then - install_screen_launcher "$HOME/$i" + install_launcher "$HOME/$i" fi done diff --git a/screen-launcher-uninstall b/byobu-launcher-uninstall similarity index 87% rename from screen-launcher-uninstall rename to byobu-launcher-uninstall index dbe5ae33..940f1705 100755 --- a/screen-launcher-uninstall +++ b/byobu-launcher-uninstall @@ -1,6 +1,6 @@ #!/bin/sh -e # -# screen-launcher-uninstall +# byobu-launcher-uninstall # Copyright (C) 2008 Canonical Ltd. # # Authors: Nick Barcet @@ -19,15 +19,15 @@ # along with this program. If not, see . -remove_screen_launcher() { +remove_launcher() { dest=$1 if [ -w "$dest" ]; then - sed -i '/\/usr\/bin\/screen-launcher$/d' "$dest" + sed -i '/\/usr\/bin\/byobu-launcher$/d' "$dest" fi # the install disabled motd printing; re-enable rm "$HOME"/.hushlogin 2>/dev/null || true } for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do - remove_screen_launcher "$HOME/$i" + remove_launcher "$HOME/$i" done diff --git a/screen-launcher.1 b/byobu-launcher.1 similarity index 100% rename from screen-launcher.1 rename to byobu-launcher.1 diff --git a/debian/changelog b/debian/changelog index 033ffb49..b0810d5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ byobu (2.16) unreleased; urgency=low * 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 + * byobu-config, byobu-launcher, byobu-launcher-install, + byobu-launcher-uninstall, debian/install, debian/rules, + rpm/byobu.spec: rename to byobu-launcher* - -- Dustin Kirkland Tue, 23 Jun 2009 02:21:01 -0500 + -- Dustin Kirkland Tue, 23 Jun 2009 02:30:27 -0500 byobu (2.15-0ubuntu1) karmic; urgency=low diff --git a/debian/install b/debian/install index b5420d50..a880f0b4 100644 --- a/debian/install +++ b/debian/install @@ -15,9 +15,9 @@ byobu-config usr/bin byobu-status usr/bin byobu-status-detail usr/bin byobu-janitor usr/bin -screen-launcher-install usr/share/byobu -screen-launcher-uninstall usr/share/byobu +byobu-launcher-install usr/share/byobu +byobu-launcher-uninstall usr/share/byobu motd+shell usr/bin -screen-launcher usr/bin +byobu-launcher usr/bin byobu-export usr/bin debian/lintian/byobu usr/share/lintian/overrides diff --git a/debian/rules b/debian/rules index 01bc3f91..975d590a 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 byobu-select-profile.1 motd+shell.1 byobu-export.1 byobu-status.1 byobu-status-detail.1 + dh_installman -i byobu-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/rpm/byobu.spec b/rpm/byobu.spec index b8e2dbb6..6bb631c8 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -74,10 +74,10 @@ 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 cp -ar byobu-status-detail ${RPM_BUILD_ROOT}/usr/bin -cp -ar screen-launcher-install ${RPM_BUILD_ROOT}/usr/share/byobu -cp -ar screen-launcher-uninstall ${RPM_BUILD_ROOT}/usr/share/byobu +cp -ar byobu-launcher-install ${RPM_BUILD_ROOT}/usr/share/byobu +cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/share/byobu cp -ar motd+shell ${RPM_BUILD_ROOT}/usr/bin -cp -ar screen-launcher ${RPM_BUILD_ROOT}/usr/bin +cp -ar byobu-launcher ${RPM_BUILD_ROOT}/usr/bin cp -ar byobu-export ${RPM_BUILD_ROOT}/usr/bin cp -ar profiles/*_* ${RPM_BUILD_ROOT}/usr/share/byobu/profiles @@ -89,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) /usr/bin/motd+shell -/usr/bin/screen-launcher +/usr/bin/byobu-launcher /usr/bin/byobu /usr/bin/byobu-config /usr/bin/byobu-export @@ -133,8 +133,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/byobu/profiles/common /usr/share/byobu/profiles/dark /usr/share/byobu/profiles/light -/usr/share/byobu/screen-launcher-install -/usr/share/byobu/screen-launcher-uninstall +/usr/share/byobu/byobu-launcher-install +/usr/share/byobu/byobu-launcher-uninstall /usr/share/byobu/windows/common %doc README %doc doc/help.txt