Merge lp://qastaging/~jefferyto/byobu/misc-updates into lp://qastaging/byobu
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~jefferyto/byobu/misc-updates |
| Merge into: | lp://qastaging/byobu |
| Diff against target: |
1406 lines (+467/-282) 29 files modified
debian/changelog (+96/-0) usr/bin/byobu-ctrl-a.in (+149/-76) usr/bin/byobu-export.in (+1/-1) usr/bin/byobu-janitor.in (+13/-7) usr/bin/byobu-launch.in (+1/-1) usr/bin/byobu-select-profile.in (+102/-75) usr/bin/byobu-status-detail.in (+1/-1) usr/bin/byobu-status.in (+6/-7) usr/bin/byobu.in (+14/-20) usr/lib/byobu/battery (+1/-1) usr/lib/byobu/disk_io (+1/-1) usr/lib/byobu/hostname (+1/-1) usr/lib/byobu/include/common (+7/-3) usr/lib/byobu/include/constants (+6/-10) usr/lib/byobu/include/dirs.in (+23/-14) usr/lib/byobu/include/shutil (+4/-4) usr/lib/byobu/ip_address (+2/-2) usr/lib/byobu/memory (+1/-1) usr/lib/byobu/release (+2/-2) usr/lib/byobu/updates_available (+14/-14) usr/lib/byobu/users (+10/-2) usr/lib/byobu/whoami (+3/-3) usr/lib/byobu/wifi_quality (+4/-4) usr/share/byobu/keybindings/f-keys.screen (+1/-1) usr/share/byobu/keybindings/f-keys.tmux (+1/-1) usr/share/byobu/profiles/Makefile.am (+1/-1) usr/share/byobu/profiles/byoburc (+0/-27) usr/share/byobu/profiles/screenrc (+1/-1) usr/share/byobu/profiles/tmuxrc (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jefferyto/byobu/misc-updates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dustin Kirkland | Pending | ||
|
Review via email:
|
|||
Description of the change
There isn't a major theme to these changes, just things I noticed while working on porting byobu to OpenWrt (but aren't critical enough that I needed to patch right away).
There is one fix (trailing "#" sign for usr/lib/
I imagine the "create new config dir in ~/.config" change may be somewhat controversial. I think at this point most users will have a ~/.config directory and keeping $HOME clean(er) is a good thing.
| Jeffery To (jefferyto) wrote | # |
| Dustin Kirkland (kirkland) wrote | # |
| Jeffery To (jefferyto) wrote | # |
| Jeffery To (jefferyto) wrote | # |
Unmerged revisions
- 2640. By Jeffery To
-
* usr/bin/
byobu-status- detail. in,
usr/bin/byobu-status. in:
- Remove unnecessary backticks; the command returns no output, only
the exit value is tested - 2639. By Jeffery To
-
* usr/bin/
byobu-ctrl- a.in,
usr/bin/byobu-janitor. in,
usr/share/byobu/keybindin gs/f-keys. screen,
usr/share/byobu/keybindin gs/f-keys. tmux:
- Fix ^A unbinding: ^A is bound in f-keys.screen / f-keys.tmux to
autorun byobu-ctrl-a, but if the user selected a different key in
byobu-config, it would unbind the custom key instead of ^A
- Use functions to help make the logic easier to understand
- Add "custom" and "manual" modes, that only unbind ^A ("emacs" mode
would also set prefix to F12 for tmux, possibly overriding the
user's custom prefix); "custom" when it is detected that the user
has customized their prefix before byobu-ctrl-a was run for the
first time, "manual" when the user just wants to disable the
autorun
- Add an "autorun" command line option, used when byobu-ctrl-a is
triggered by the user pressing ^A; in this case, byobu-ctrl-a will
wait for the user to press enter/return before exiting, so that
the user can read the text output before the window auto-closes
- Add a quit option, so that the user can exit byobu-ctrl-a without
making any changes - 2638. By Jeffery To
-
* usr/bin/
byobu-status. in:
- Include $BYOBU_CONFIG_ DIR/datetime. tmux in the sourcing for loop - 2637. By Jeffery To
-
* usr/bin/
byobu-select- profile. in:
- Update help message
- Remove $BYOBU_CONFIG_ DIR/profile test, it is not used directly in
the script
- Restore list colors functionality
- Use local variables in functions
- Simplify color calculation
- Exit when --list / --help / invalid options are specified, before
making changes
- Removed -- option, command utilities that have a -- option expect
data to come after the -- - 2636. By Jeffery To
-
* usr/bin/
byobu-janitor. in:
- Remove unused variables - 2635. By Jeffery To
-
* usr/bin/
byobu-export. in,
usr/bin/byobu-janitor. in,
usr/bin/byobu-launch. in,
usr/bin/byobu-select- profile. in,
usr/bin/byobu-status- detail. in,
usr/bin/byobu-status. in,
usr/bin/byobu.in,
usr/lib/byobu/battery,
usr/lib/byobu/disk_ io,
usr/lib/byobu/hostname,
usr/lib/byobu/include/ common,
usr/lib/byobu/include/ constants,
usr/lib/byobu/include/ shutil,
usr/lib/byobu/ip_ address,
usr/lib/byobu/memory,
usr/lib/byobu/release,
usr/lib/byobu/updates_ available,
usr/lib/byobu/whoami,
usr/lib/byobu/wifi_ quality:
- Add (and use) a byobu_test function to wrap $BYOBU_TEST - 2634. By Jeffery To
-
* usr/bin/byobu.in:
- Remove exporting of $BYOBU_BACKEND, this is already done in
usr/lib/byobu/ include/ constants - 2633. By Jeffery To
-
* usr/lib/
byobu/include/ constants:
- Remove sourcing of files looking for $BYOBU_BACKEND, this is
already done in usr/lib/byobu/include/ common - 2632. By Jeffery To
-
* usr/bin/
byobu-status- detail. in:
- Use $BYOBU_TEST - 2631. By Jeffery To
-
* usr/bin/byobu.in:
- Replace $HOME/.$PKG with $BYOBU_CONFIG_DIR
Should I separate these changes into separate branches/merge requests?