* [PATCH 1/5] reset: remove script from the package
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
@ 2017-07-15 21:20 ` Sami Kerola
2017-07-15 21:20 ` [PATCH 2/5] ldattach: simplify debugging function when vwarnx(3) is available Sami Kerola
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Sami Kerola @ 2017-07-15 21:20 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
This script requires ncurses to work, and the ncurses provides reset so
there should not be need to keep this script hanging around.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
Documentation/deprecated.txt | 5 -----
configure.ac | 8 --------
term-utils/Makemodule.am | 6 ------
term-utils/reset | 19 -------------------
term-utils/reset.1 | 45 --------------------------------------------
5 files changed, 83 deletions(-)
delete mode 100755 term-utils/reset
delete mode 100644 term-utils/reset.1
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt
index 82b80c1fd..34ea698da 100644
--- a/Documentation/deprecated.txt
+++ b/Documentation/deprecated.txt
@@ -93,11 +93,6 @@ Why: parallel port printers are probably almost extinct devices
----------------------------
-What: reset
-Why: ncurses has better reset(1)
-
-----------------------------
-
The Single UNIX(TM) Specification, Version 2
Copyright (C) 1997 The Open Group
diff --git a/configure.ac b/configure.ac
index f1928d6b4..c76c2a0f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1741,14 +1741,6 @@ UL_BUILD_INIT([rename])
AM_CONDITIONAL([BUILD_RENAME], [test "x$build_rename" = xyes])
-AC_ARG_ENABLE([reset],
- AS_HELP_STRING([--enable-reset], [build reset]),
- [], [UL_DEFAULT_ENABLE([reset], [no])]
-)
-UL_BUILD_INIT([reset])
-AM_CONDITIONAL([BUILD_RESET], [test "x$build_reset" = xyes])
-
-
AC_ARG_ENABLE([vipw],
AS_HELP_STRING([--enable-vipw], [build vipw]),
[], [UL_DEFAULT_ENABLE([vipw], [no])]
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index ad1bb1f8a..da05a722c 100644
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -52,12 +52,6 @@ endif
endif
-if BUILD_RESET
-dist_usrbin_exec_SCRIPTS += term-utils/reset
-dist_man_MANS += term-utils/reset.1
-endif
-
-
if BUILD_MESG
usrbin_exec_PROGRAMS += mesg
dist_man_MANS += term-utils/mesg.1
diff --git a/term-utils/reset b/term-utils/reset
deleted file mode 100755
index 43f83cbda..000000000
--- a/term-utils/reset
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# This command is deprecated. The utility is in maintenance mode,
-# meaning we keep them in source tree for backward compatibility
-# only. Do not waste time making this command better, unless the
-# fix is about security or other very critical issue.
-#
-# See Documentation/deprecated.txt for more information.
-stty sane
-tput clear
-tput rmacs
-tput rmm
-tput rmso
-tput rmul
-tput rs1
-tput rs2
-tput rs3
-bot=$((${LINES:-$(tput lines)} - 1))
-if test "${bot}" -le "0"; then bot=24; fi
-tput csr 0 ${bot}
diff --git a/term-utils/reset.1 b/term-utils/reset.1
deleted file mode 100644
index 6079b6e91..000000000
--- a/term-utils/reset.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
-.\" May be distributed under the GNU General Public License
-.TH RESET 1 "October 1993" "util-linux" "User Commands"
-.SH NAME
-reset \- reset the terminal
-.SH SYNOPSIS
-.BR reset
-.SH DESCRIPTION
-.B reset
-calls
-.BR tput (1)
-with the
-.IR clear ,
-.IR rmacs ,
-.IR rmm ,
-.IR rmul ,
-.IR rs1 ,
-.IR rs2 ,
-and
-.I rs3
-arguments. This causes
-.B tput
-to send appropriate reset strings to the terminal based on information in
-.I /etc/termcap
-(for the GNU or BSD
-.BR tput )
-or in the terminfo database
-(for the
-.B ncurses
-.BR tput ).
-This sequence seems to be sufficient to reset a Linux VC when it
-starts printing "funny-looking" characters. For good measure,
-.BR stty (1)
-is called with the
-.I sane
-argument in an attempt to get cooked mode back.
-.SH "SEE ALSO"
-.BR clear (1),
-.BR stty (1),
-.BR tput (1)
-.SH AUTHOR
-Rik Faith (faith@cs.unc.edu)
-.SH AVAILABILITY
-The reset command is part of the util-linux package and is available from
-https://www.kernel.org/pub/linux/utils/util-linux/.
--
2.13.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/5] ldattach: simplify debugging function when vwarnx(3) is available
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
2017-07-15 21:20 ` [PATCH 1/5] reset: remove script from the package Sami Kerola
@ 2017-07-15 21:20 ` Sami Kerola
2017-07-15 21:20 ` [PATCH 3/5] docs: add optional option back to struct option Sami Kerola
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Sami Kerola @ 2017-07-15 21:20 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
The vwarnx(3) is probably not available in all libc implementations, in such
cases use the earlier printout as a fallback.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
configure.ac | 1 +
sys-utils/ldattach.c | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index c76c2a0f3..38b968878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,6 +428,7 @@ AC_CHECK_FUNCS([ \
sysinfo \
timegm \
usleep \
+ vwarnx \
warn \
warnx \
])
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index eb04b5e33..d33d68535 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -137,11 +137,15 @@ static void dbg(char *fmt, ...)
if (debug == 0)
return;
fflush(NULL);
- fprintf(stderr, "%s: ", program_invocation_short_name);
va_start(args, fmt);
+#ifdef HAVE_VWARNX
+ vwarnx(fmt, args);
+#else
+ fprintf(stderr, "%s: ", program_invocation_short_name);
vfprintf(stderr, fmt, args);
- va_end(args);
fprintf(stderr, "\n");
+#endif
+ va_end(args);
fflush(NULL);
return;
}
@@ -252,7 +256,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
static void handler(int s)
{
- dbg("got SIG %i -> exiting\n", s);
+ dbg("got SIG %i -> exiting", s);
exit(EXIT_SUCCESS);
}
--
2.13.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/5] docs: add optional option back to struct option
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
2017-07-15 21:20 ` [PATCH 1/5] reset: remove script from the package Sami Kerola
2017-07-15 21:20 ` [PATCH 2/5] ldattach: simplify debugging function when vwarnx(3) is available Sami Kerola
@ 2017-07-15 21:20 ` Sami Kerola
2017-07-15 21:20 ` [PATCH 4/5] uuidparse: add bash-completion file Sami Kerola
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Sami Kerola @ 2017-07-15 21:20 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
The line was accidentally removed in the reference commit where only the
short option had to go. Rest of the change is indentation.
Reference: 326c5c93b917a623f346155c8b3438b379d9fd60
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
Documentation/boilerplate.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
index 68ffbf7ea..a92f7f097 100644
--- a/Documentation/boilerplate.c
+++ b/Documentation/boilerplate.c
@@ -69,14 +69,15 @@ int main(int argc, char **argv)
OPT_OPTIONAL /* see howto-man-page.txt about short option */
};
static const struct option longopts[] = {
- { "no-argument", no_argument, NULL, 'n' },
- { "required", required_argument, NULL, 'r' },
- { "extremely-long-long-option", no_argument, NULL, 'e' },
- { "xyzzy", no_argument, NULL, OPT_XYZZY },
- { "long-explanation", no_argument, NULL, 'l' },
- { "foobar", no_argument, NULL, 'f' },
- { "version", no_argument, NULL, 'V' },
- { "help", no_argument, NULL, 'h' },
+ { "no-argument", no_argument, NULL, 'n' },
+ { "optional", optional_argument, NULL, OPT_OPTIONAL },
+ { "required", required_argument, NULL, 'r' },
+ { "extremely-long-long-option", no_argument, NULL, 'e' },
+ { "xyzzy", no_argument, NULL, OPT_XYZZY },
+ { "long-explanation", no_argument, NULL, 'l' },
+ { "foobar", no_argument, NULL, 'f' },
+ { "version", no_argument, NULL, 'V' },
+ { "help", no_argument, NULL, 'h' },
{ NULL, 0, NULL, 0 }
};
--
2.13.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/5] uuidparse: add bash-completion file
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
` (2 preceding siblings ...)
2017-07-15 21:20 ` [PATCH 3/5] docs: add optional option back to struct option Sami Kerola
@ 2017-07-15 21:20 ` Sami Kerola
2017-07-15 21:20 ` [PATCH 5/5] bash-completion: make completions to work when bash set -u is in use Sami Kerola
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Sami Kerola @ 2017-07-15 21:20 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
bash-completion/Makemodule.am | 3 +++
bash-completion/uuidparse | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 bash-completion/uuidparse
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index a884a138e..a4cd4fc36 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -183,6 +183,9 @@ endif
if BUILD_LIBUUID
dist_bashcompletion_DATA += bash-completion/uuidgen
endif
+if BUILD_UUIDPARSE
+dist_bashcompletion_DATA += bash-completion/uuidparse
+endif
if BUILD_UUIDD
dist_bashcompletion_DATA += bash-completion/uuidd
endif
diff --git a/bash-completion/uuidparse b/bash-completion/uuidparse
new file mode 100644
index 000000000..a646844f2
--- /dev/null
+++ b/bash-completion/uuidparse
@@ -0,0 +1,37 @@
+_uuidparse_module()
+{
+ local cur prev OPTS
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ case $prev in
+ '-o'|'--output')
+ local prefix realcur OUTPUT
+ realcur="${cur##*,}"
+ prefix="${cur%$realcur}"
+ for WORD in "UUID VARIANT TYPE TIME"; do
+ if ! [[ $prefix == *"$WORD"* ]]; then
+ OUTPUT="$WORD ${OUTPUT:-""}"
+ fi
+ done
+ compopt -o nospace
+ COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )
+ return 0
+ ;;
+ '-h'|'--help'|'-V'|'--version')
+ return 0
+ ;;
+ esac
+ OPTS="
+ --json
+ --noheadings
+ --output
+ --raw
+ --help
+ --version
+ "
+ COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+ return 0
+
+}
+complete -F _uuidparse_module uuidparse
--
2.13.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/5] bash-completion: make completions to work when bash set -u is in use
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
` (3 preceding siblings ...)
2017-07-15 21:20 ` [PATCH 4/5] uuidparse: add bash-completion file Sami Kerola
@ 2017-07-15 21:20 ` Sami Kerola
2017-07-15 22:45 ` [PATCH 0/5] pull: five mutually unrelated changes Bruce Dubbs
2017-07-17 10:04 ` Karel Zak
6 siblings, 0 replies; 11+ messages in thread
From: Sami Kerola @ 2017-07-15 21:20 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
User who want to avoid refering to none-existing variables got earlier the
following error.
$ set -u
$ findmnt --output <tab>bash: OUTPUT: unbound variable
Here is short explanation of this setting.
$ help set
-u Treat unset variables as an error when substituting.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
bash-completion/blkid | 2 +-
bash-completion/fdisk | 2 +-
bash-completion/fincore | 2 +-
bash-completion/findmnt | 2 +-
bash-completion/losetup | 2 +-
bash-completion/lsipc | 2 +-
bash-completion/lslocks | 2 +-
bash-completion/lsmem | 2 +-
bash-completion/partx | 2 +-
bash-completion/prlimit | 2 +-
bash-completion/sfdisk | 2 +-
bash-completion/swapon | 2 +-
bash-completion/wdctl | 2 +-
bash-completion/zramctl | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/bash-completion/blkid b/bash-completion/blkid
index eb2ecf3fe..57b34c3f4 100644
--- a/bash-completion/blkid
+++ b/bash-completion/blkid
@@ -59,7 +59,7 @@ _blkid_module()
prefix="${cur%$realcur}"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/fdisk b/bash-completion/fdisk
index ef6c5beb4..855de1468 100644
--- a/bash-completion/fdisk
+++ b/bash-completion/fdisk
@@ -49,7 +49,7 @@ _fdisk_module()
"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/fincore b/bash-completion/fincore
index 4988f198b..3639763b5 100644
--- a/bash-completion/fincore
+++ b/bash-completion/fincore
@@ -12,7 +12,7 @@ _fincore_module()
OUTPUT_ALL='PAGES SIZE FILE RES'
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/findmnt b/bash-completion/findmnt
index 5583fbf6c..bdfa5de5c 100644
--- a/bash-completion/findmnt
+++ b/bash-completion/findmnt
@@ -55,7 +55,7 @@ _findmnt_module()
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/losetup b/bash-completion/losetup
index 7fee1d0ae..b58d8de94 100644
--- a/bash-completion/losetup
+++ b/bash-completion/losetup
@@ -33,7 +33,7 @@ _losetup_module()
SIZELIMIT DIO"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/lsipc b/bash-completion/lsipc
index ffe44b7d1..a40fe4286 100644
--- a/bash-completion/lsipc
+++ b/bash-completion/lsipc
@@ -35,7 +35,7 @@ _lsipc_module()
"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/lslocks b/bash-completion/lslocks
index 4ca1e6b6e..acc7b1ff6 100644
--- a/bash-completion/lslocks
+++ b/bash-completion/lslocks
@@ -20,7 +20,7 @@ _lslocks_module()
OUTPUT_ALL="COMMAND PID TYPE SIZE MODE M START END PATH BLOCKER"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/lsmem b/bash-completion/lsmem
index 85cf3e01a..8f7a46ec3 100644
--- a/bash-completion/lsmem
+++ b/bash-completion/lsmem
@@ -12,7 +12,7 @@ _lsmem_module()
OUTPUT_ALL='RANGE SIZE STATE REMOVABLE BLOCK NODE'
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/partx b/bash-completion/partx
index 929000013..2368336ed 100644
--- a/bash-completion/partx
+++ b/bash-completion/partx
@@ -15,7 +15,7 @@ _partx_module()
prefix="${cur%$realcur}"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/prlimit b/bash-completion/prlimit
index fff7a85c5..f5e00bb16 100644
--- a/bash-completion/prlimit
+++ b/bash-completion/prlimit
@@ -17,7 +17,7 @@ _prlimit_module()
OUTPUT_ALL="DESCRIPTION RESOURCE SOFT HARD UNITS"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/sfdisk b/bash-completion/sfdisk
index c00e8c799..9401f89ac 100644
--- a/bash-completion/sfdisk
+++ b/bash-completion/sfdisk
@@ -28,7 +28,7 @@ _sfdisk_module()
"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/swapon b/bash-completion/swapon
index fc80af5eb..4a53ec5ac 100644
--- a/bash-completion/swapon
+++ b/bash-completion/swapon
@@ -18,7 +18,7 @@ _swapon_module()
OUTPUT_ALL="NAME TYPE SIZE USED PRIO UUID LABEL"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/wdctl b/bash-completion/wdctl
index 811b5e3cc..f1a870ef6 100644
--- a/bash-completion/wdctl
+++ b/bash-completion/wdctl
@@ -29,7 +29,7 @@ _wdctl_module()
OUTPUT_ALL="FLAG DESCRIPTION STATUS BOOT-STATUS DEVICE"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
diff --git a/bash-completion/zramctl b/bash-completion/zramctl
index 8c7767ce0..672d8102a 100644
--- a/bash-completion/zramctl
+++ b/bash-completion/zramctl
@@ -18,7 +18,7 @@ _zramctl_module()
MIGRATED MOUNTPOINT"
for WORD in $OUTPUT_ALL; do
if ! [[ $prefix == *"$WORD"* ]]; then
- OUTPUT="$WORD $OUTPUT"
+ OUTPUT="$WORD ${OUTPUT:-""}"
fi
done
compopt -o nospace
--
2.13.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/5] pull: five mutually unrelated changes
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
` (4 preceding siblings ...)
2017-07-15 21:20 ` [PATCH 5/5] bash-completion: make completions to work when bash set -u is in use Sami Kerola
@ 2017-07-15 22:45 ` Bruce Dubbs
2017-07-16 9:08 ` Sami Kerola
2017-07-17 10:04 ` Karel Zak
6 siblings, 1 reply; 11+ messages in thread
From: Bruce Dubbs @ 2017-07-15 22:45 UTC (permalink / raw)
To: Sami Kerola, util-linux
Sami Kerola wrote:
> The 'big' change in this pull request is to drop reset(1) from util-linux.
> I don't think there is any point of keep this script hanging around.
Why do you think that. I find it useful when some application corrupts
the screen. I realize that reset is a symlink to tset, but I find reset
easier to remember/use.
-- Bruce
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/5] pull: five mutually unrelated changes
2017-07-15 22:45 ` [PATCH 0/5] pull: five mutually unrelated changes Bruce Dubbs
@ 2017-07-16 9:08 ` Sami Kerola
2017-07-16 15:25 ` Bruce Dubbs
0 siblings, 1 reply; 11+ messages in thread
From: Sami Kerola @ 2017-07-16 9:08 UTC (permalink / raw)
To: Bruce Dubbs; +Cc: util-linux
On 15 July 2017 at 23:45, Bruce Dubbs <bruce.dubbs@gmail.com> wrote:
>> The 'big' change in this pull request is to drop reset(1) from util-linux.
>> I don't think there is any point of keep this script hanging around.
>
> Why do you think that. I find it useful when some application corrupts the
> screen. I realize that reset is a symlink to tset, but I find reset easier
> to remember/use.
The ncurses package contains both binaries tput(1) and reset(1). So this
script will not work without ncurses, and the very same package has the
binary that obsoletes the script.
--
Sami Kerola
http://www.iki.fi/kerolasa/
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] pull: five mutually unrelated changes
2017-07-16 9:08 ` Sami Kerola
@ 2017-07-16 15:25 ` Bruce Dubbs
2017-07-17 9:28 ` Karel Zak
0 siblings, 1 reply; 11+ messages in thread
From: Bruce Dubbs @ 2017-07-16 15:25 UTC (permalink / raw)
To: kerolasa; +Cc: util-linux
Sami Kerola wrote:
> On 15 July 2017 at 23:45, Bruce Dubbs <bruce.dubbs@gmail.com> wrote:
>>> The 'big' change in this pull request is to drop reset(1) from util-linux.
>>> I don't think there is any point of keep this script hanging around.
>>
>> Why do you think that. I find it useful when some application corrupts the
>> screen. I realize that reset is a symlink to tset, but I find reset easier
>> to remember/use.
>
> The ncurses package contains both binaries tput(1) and reset(1). So this
> script will not work without ncurses, and the very same package has the
> binary that obsoletes the script.
Thanks. I agree that duplicate functions should be removed.
-- Bruce
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] pull: five mutually unrelated changes
2017-07-16 15:25 ` Bruce Dubbs
@ 2017-07-17 9:28 ` Karel Zak
0 siblings, 0 replies; 11+ messages in thread
From: Karel Zak @ 2017-07-17 9:28 UTC (permalink / raw)
To: Bruce Dubbs; +Cc: kerolasa, util-linux
On Sun, Jul 16, 2017 at 10:25:57AM -0500, Bruce Dubbs wrote:
> Sami Kerola wrote:
> > On 15 July 2017 at 23:45, Bruce Dubbs <bruce.dubbs@gmail.com> wrote:
> > > > The 'big' change in this pull request is to drop reset(1) from util-linux.
> > > > I don't think there is any point of keep this script hanging around.
> > >
> > > Why do you think that. I find it useful when some application corrupts the
> > > screen. I realize that reset is a symlink to tset, but I find reset easier
> > > to remember/use.
> >
> > The ncurses package contains both binaries tput(1) and reset(1). So this
> > script will not work without ncurses, and the very same package has the
> > binary that obsoletes the script.
>
> Thanks. I agree that duplicate functions should be removed.
And note that it's already deprecated and disabled by default. You
need --enable-reset now. I guess distros use reset(1) from ncurses for
really long time.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/5] pull: five mutually unrelated changes
2017-07-15 21:20 [PATCH 0/5] pull: five mutually unrelated changes Sami Kerola
` (5 preceding siblings ...)
2017-07-15 22:45 ` [PATCH 0/5] pull: five mutually unrelated changes Bruce Dubbs
@ 2017-07-17 10:04 ` Karel Zak
6 siblings, 0 replies; 11+ messages in thread
From: Karel Zak @ 2017-07-17 10:04 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Sat, Jul 15, 2017 at 10:20:41PM +0100, Sami Kerola wrote:
> Documentation/boilerplate.c | 17 ++++++++--------
> Documentation/deprecated.txt | 5 -----
> bash-completion/Makemodule.am | 3 +++
> bash-completion/blkid | 2 +-
> bash-completion/fdisk | 2 +-
> bash-completion/fincore | 2 +-
> bash-completion/findmnt | 2 +-
> bash-completion/losetup | 2 +-
> bash-completion/lsipc | 2 +-
> bash-completion/lslocks | 2 +-
> bash-completion/lsmem | 2 +-
> bash-completion/partx | 2 +-
> bash-completion/prlimit | 2 +-
> bash-completion/sfdisk | 2 +-
> bash-completion/swapon | 2 +-
> bash-completion/uuidparse | 37 +++++++++++++++++++++++++++++++++++
> bash-completion/wdctl | 2 +-
> bash-completion/zramctl | 2 +-
> configure.ac | 9 +--------
> sys-utils/ldattach.c | 10 +++++++---
> term-utils/Makemodule.am | 6 ------
> term-utils/reset | 19 ------------------
> term-utils/reset.1 | 45 -------------------------------------------
> 23 files changed, 71 insertions(+), 108 deletions(-)
> create mode 100644 bash-completion/uuidparse
> delete mode 100755 term-utils/reset
> delete mode 100644 term-utils/reset.1
Applied, thanks.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 11+ messages in thread