* debian/install, rpm/byobu.spec, byobu-launcher-install,

byobu-launcher-uninstall, byobu-janitor: put the launcher install and
    uninstall utilities in /usr/bin
This commit is contained in:
Dustin Kirkland 2009-12-12 10:29:56 -08:00
commit 7a577e4b12
5 changed files with 11 additions and 10 deletions

View file

@ -108,7 +108,7 @@ sed -i "s/^network.*=/network=/" "$HOME/.$PKG/status"
# screen-launcher was renamed byobu-launcher; if the user has byobu
# set to auto-launch, update their configuration to use the byobu-launcher
if grep -qs "screen-launcher$" "$HOME/.profile"; then
/usr/share/$PKG/byobu-launcher-install
byobu-launcher-install
fi
# Affects: Upgrades from <= byobu-2.25

View file

@ -31,7 +31,7 @@ install_launcher() {
}
# Sanitize the environment
/usr/share/$PKG/byobu-launcher-uninstall || true
byobu-launcher-uninstall || true
# Install in $HOME/.profile unconditionally
install_launcher "$HOME/.profile"

View file

@ -18,12 +18,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
remove_launcher() {
dest=$1
if [ -w "$dest" ]; then
sed -i '/byobu-launcher$/d' "$dest"
sed -i '/screen-launcher$/d' "$dest"
sed -i "/$PKG-launcher$/d" "$dest"
sed -i "/screen-launcher$/d" "$dest"
fi
# the install disabled motd printing; re-enable
rm "$HOME"/.hushlogin 2>/dev/null || true

4
debian/install vendored
View file

@ -14,8 +14,8 @@ byobu-reconnect-sockets usr/bin
byobu-status usr/bin
byobu-status-detail usr/bin
byobu-janitor usr/bin
byobu-launcher-install usr/share/byobu
byobu-launcher-uninstall usr/share/byobu
byobu-launcher-install usr/bin
byobu-launcher-uninstall usr/bin
motd+shell usr/bin
byobu-launcher usr/bin
byobu-export usr/bin

View file

@ -56,8 +56,8 @@ 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 byobu-launcher-install ${RPM_BUILD_ROOT}/usr/share/byobu
cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/share/byobu
cp -ar byobu-launcher-install ${RPM_BUILD_ROOT}/usr/bin
cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/bin
cp -ar motd+shell ${RPM_BUILD_ROOT}/usr/bin
cp -ar byobu-launcher ${RPM_BUILD_ROOT}/usr/bin
cp -ar byobu-janitor ${RPM_BUILD_ROOT}/usr/bin
@ -133,8 +133,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/byobu/profiles/light_purple
/usr/share/byobu/profiles/light_red
/usr/share/byobu/profiles/light_yellow
/usr/share/byobu/byobu-launcher-install
/usr/share/byobu/byobu-launcher-uninstall
/usr/bin/byobu-launcher-install
/usr/bin/byobu-launcher-uninstall
/usr/share/byobu/windows/common
/etc/byobu
%doc README