mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
* byobu-config, byobu-launcher, byobu-launcher-install,
byobu-launcher-uninstall, debian/install, debian/rules,
rpm/byobu.spec: rename to byobu-launcher*
Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland
parent
e1c5396b69
commit
7a74a41d1e
9 changed files with 29 additions and 26 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# screen-launcher
|
||||
# byobu-launcher
|
||||
# Copyright (C) 2008 Canonical Ltd.
|
||||
#
|
||||
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# screen-launcher-install
|
||||
# byobu-launcher-install
|
||||
# Copyright (C) 2008 Canonical Ltd.
|
||||
#
|
||||
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
||||
|
|
@ -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
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# screen-launcher-uninstall
|
||||
# byobu-launcher-uninstall
|
||||
# Copyright (C) 2008 Canonical Ltd.
|
||||
#
|
||||
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
||||
|
|
@ -19,15 +19,15 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
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
|
||||
5
debian/changelog
vendored
5
debian/changelog
vendored
|
|
@ -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 <kirkland@ubuntu.com> Tue, 23 Jun 2009 02:21:01 -0500
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 23 Jun 2009 02:30:27 -0500
|
||||
|
||||
byobu (2.15-0ubuntu1) karmic; urgency=low
|
||||
|
||||
|
|
|
|||
6
debian/install
vendored
6
debian/install
vendored
|
|
@ -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
|
||||
|
|
|
|||
2
debian/rules
vendored
2
debian/rules
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue