diff --git a/debian/changelog b/debian/changelog index 0fa5450a..2d7852d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,42 +1,11 @@ -byobu (6.13-0ubuntu1) plucky; urgency=medium - - * usr/lib/byobu/include/common: - - added -v|--version and -h|--help to most executables - * usr/share/byobu/profiles/bashrc: - - fix PS1 ANSI escape sequences causing line wrap errors - - -- Dustin Kirkland Sat, 29 Mar 2025 19:55:23 -0500 - -byobu (6.12-0ubuntu1) noble; urgency=medium - - * usr/share/byobu/profiles/bashrc: - - added git branch to bash ps1 prompt - - -- Dustin Kirkland Sat, 17 Feb 2024 07:25:02 -0600 - -byobu (6.11-0ubuntu1) noble; urgency=medium - - * usr/share/byobu/profiles/bashrc: - - fix BYOBU_RUN_DIR and BYOBU_PREFIX issue - - https://github.com/dustinkirkland/byobu/pull/62 - - https://launchpad.net/bugs/2051995 LP: #2051995 - * usr/bin/byobu-launcher-install.in: - - Fix for VSCode, fish and byobu installations - - https://github.com/dustinkirkland/byobu/commit/f917d2169afdec623f5b32723d93bfd91d34b92f#commitcomment-137955113 - * usr/lib/byobu/updates_available: - - added support for dnf package manager - - https://code.launchpad.net/~sanjay-ankur/byobu/byobu/+merge/415959 - - -- Dustin Kirkland Sat, 10 Feb 2024 11:24:04 -0600 - -byobu (6.10-0ubuntu1) noble; urgency=medium +byobu (6.10) unreleased; urgency=medium * debian/compat, debian/control: - bump compat, fix vcs lintian warning, fix debhelper warnings * usr/share/byobu/profiles/bashrc: - fix timer string logic - -- Dustin Kirkland Tue, 23 Jan 2024 09:43:03 -0600 + -- Dustin Kirkland Tue, 23 Jan 2024 09:03:16 -0600 byobu (6.9-0ubuntu1) noble; urgency=medium diff --git a/usr/bin/byobu-launcher-install.in b/usr/bin/byobu-launcher-install.in index 4ad6d0d3..a73db22f 100755 --- a/usr/bin/byobu-launcher-install.in +++ b/usr/bin/byobu-launcher-install.in @@ -49,8 +49,8 @@ install_launcher() { install_launcher_fish() { $PKG-launcher-uninstall "$1" || true - printf "if not set -q VSCODE_CWD; " >> "$1" - printf " status --is-login; and status --is-interactive; and exec byobu-launcher;" >> "$1" + printf "if not set -q VSCODE_CWD" >> "$1" + printf " status --is-login; and status --is-interactive; and exec byobu-launcher" >> "$1" printf "end" >> "$1" } diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index b04eb1ab..6cd87853 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=6.12 +VERSION=6.10 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common index 9081f6cb..04ae4f4d 100755 --- a/usr/lib/byobu/include/common +++ b/usr/lib/byobu/include/common @@ -53,8 +53,3 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then export BYOBU_DISTRO="$_RET" BYOBU_INCLUDED_LIBS=1 fi - -case "$1" in - -v|--version) [ "$(basename $0)" != "byobu" ] && exec byobu -v ;; - -h|--help) exec man $(basename $0) ;; -esac diff --git a/usr/lib/byobu/updates_available b/usr/lib/byobu/updates_available index 6624255c..9bcc8202 100755 --- a/usr/lib/byobu/updates_available +++ b/usr/lib/byobu/updates_available @@ -85,9 +85,6 @@ ___update_cache() { # Wolfi updates are cheap (~1s); so update cache every time apk update 2>&1 >/dev/null apk upgrade --simulate | grep -c " Upgrading " >$mycache 2>/dev/null & - elif eval $BYOBU_TEST dnf >/dev/null; then - # If dnf exists, use it - flock -xn "$flock" dnf list --upgrades -q -y | grep -vc "Available Upgrades" >$mycache 2>/dev/null & fi } @@ -144,9 +141,6 @@ ___update_needed() { # formulae database was updated [ "$(brew --prefix)/Library/Formula" -nt "$mycache" ] return $? - elif [ -e "/var/cache/dnf/packages.db" ]; then - [ "/var/cache/dnf/packages.db" -nt "$mycache" ] - return $? fi return 1 } diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 502b55f7..1455193e 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -25,11 +25,7 @@ case "$TERM" in esac [ -n "$BYOBU_CHARMAP" ] || BYOBU_CHARMAP=$(locale charmap 2>/dev/null || echo) [ -z "$USER" ] && export USER=$(whoami) -[ -d "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" -[ -r "$BYOBU_PREFIX/lib/byobu/include/dirs" ] && . "$BYOBU_PREFIX/lib/byobu/include/dirs" - -byobu_prompt_git() { git branch 2>/dev/null | sed -e "/^[^*]/d" -e "s/* \(.*\)/ (\1)/"; } -byobu_prompt_status() { printf "%s" "[$?]"; } +byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e " $e "; } byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" "\$"; } byobu_prompt_runtime() { # Calculate the approximate runtime of the previous command @@ -37,9 +33,8 @@ byobu_prompt_runtime() { local starttime endtime duration days hours minutes seconds microseconds nanoseconds str [ ! -r $BYOBU_RUN_DIR/timer.$$ ] && printf "[0.000s]" && return read starttime < $BYOBU_RUN_DIR/timer.$$ 2>/dev/null || true - # strip to non-decimal time. avoids LP: #2052610 - endtime=${EPOCHREALTIME/[^0-9]/} - starttime=${starttime/[^0-9]/} + endtime=${EPOCHREALTIME/./} + starttime=${starttime/./} duration=$((endtime - starttime)) days=$((duration/1000000/60/60/24)) hours=$((duration/1000000/60/60%24)) @@ -56,12 +51,12 @@ byobu_prompt_runtime() { printf "[%s]" "$str" 1>&2 } # Requires Bash 4.x -export PS0='$(printf "%s" ${EPOCHREALTIME/[^0-9]/} >"$BYOBU_RUN_DIR/timer.$$")' +export PS0='$(printf "%s" ${EPOCHREALTIME/./} >"$BYOBU_RUN_DIR/timer.$$")' case "$BYOBU_DISTRO" in "Ubuntu") # Use Ubuntu colors (grey / orange / aubergine) - export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(byobu_prompt_symbol) " + export PS1="${debian_chroot:+($debian_chroot)}\[\e[38;5;202m\]\$(byobu_prompt_status)\[\e[00m\]\$(byobu_prompt_runtime) \[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " export GREP_COLORS="ms=01;38;5;202:mc=01;31:sl=:cx=:fn=01;38;5;132:ln=32:bn=32:se=00;38;5;242" export LESS_TERMCAP_mb=$(printf '\e[01;31m') # enter blinking mode – red export LESS_TERMCAP_md=$(printf '\e[01;38;5;180m') # enter double-bright mode – bold light orange @@ -77,14 +72,14 @@ case "$BYOBU_DISTRO" in fi ;; "Wolfi") - # Use Wolfi colors (pink / purple / blue) + # Use Wolfi colors (pink / purple / grey) # For reference: https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg # Convert hex to 256: https://gist.githubusercontent.com/MicahElliott/719710/raw/73d047f0a3ffc35f0655488547e7f24fa3f04ea6/colortrans.py # Use Wolfi colors (pink=170 / purple=98 / blue=63); flashing error code on previous command non-zero exit - export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;170m\]\u\[\e[00m\]@\[\e[38;5;98m\]\h\[\e[00m\]:\[\e[38;5;63m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(byobu_prompt_symbol) " + PS1="\[\e[03;5;15;54m\]\$(byobu_prompt_status)\[\e[00m\]\$(byobu_prompt_runtime) \[\e[38;5;170m\]\u\[\e[00m\]@\[\e[38;5;98m\]\h\[\e[00m\]:\[\e[38;5;63m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " ;; *) - # Use primary colors (blue / yellow / red ) - export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;69m\]\u\[\e[00m\]@\[\e[38;5;214m\]\h\[\e[00m\]:\[\e[38;5;167m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(byobu_prompt_symbol) " + # Use Googley colors (blue / red / yellow / blue / green / red ) + PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\[\e[00m\] " ;; esac