diff options
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/cat-and-grep.sh | 10 | ||||
| -rw-r--r-- | src/etc/natvis/libcore.natvis | 4 | ||||
| -rwxr-xr-x | src/etc/rust-gdbgui | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/etc/cat-and-grep.sh b/src/etc/cat-and-grep.sh index 77dc52a93..238f7f5b6 100755 --- a/src/etc/cat-and-grep.sh +++ b/src/etc/cat-and-grep.sh @@ -26,7 +26,7 @@ Options: -i Case insensitive search. ' -GREPPER=fgrep +GREPPER=grep INVERT=0 GREPFLAGS='q' while getopts ':vieh' OPTION; do @@ -39,7 +39,7 @@ while getopts ':vieh' OPTION; do GREPFLAGS="i$GREPFLAGS" ;; e) - GREPPER=egrep + GREPFLAGS="E$GREPFLAGS" ;; h) echo "$USAGE" @@ -51,6 +51,12 @@ while getopts ':vieh' OPTION; do esac done +if ! echo "$GREPFLAGS" | grep -q E +then + # use F flag if there is not an E flag + GREPFLAGS="F$GREPFLAGS" +fi + shift $((OPTIND - 1)) # use gnu version of tool if available (for bsd) diff --git a/src/etc/natvis/libcore.natvis b/src/etc/natvis/libcore.natvis index a4e8a57e4..624d8cc5c 100644 --- a/src/etc/natvis/libcore.natvis +++ b/src/etc/natvis/libcore.natvis @@ -154,10 +154,10 @@ </Type> <Type Name="core::time::Duration"> - <DisplayString>{secs,d}s {nanos,d}ns</DisplayString> + <DisplayString>{secs,d}s {nanos.__0,d}ns</DisplayString> <Expand> <Item Name="seconds">secs,d</Item> - <Item Name="nanoseconds">nanos,d</Item> + <Item Name="nanoseconds">nanos.__0,d</Item> </Expand> </Type> </AutoVisualizer> diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui index 9744913b6..590e488e6 100755 --- a/src/etc/rust-gdbgui +++ b/src/etc/rust-gdbgui @@ -58,7 +58,6 @@ GDB_ARGS="--directory=\"$GDB_PYTHON_MODULE_DIRECTORY\" -iex \"add-auto-load-safe # Finally we execute gdbgui. PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" \ exec ${RUST_GDBGUI} \ - --gdb ${RUST_GDB} \ - --gdb-args "${GDB_ARGS}" \ + --gdb-cmd "${RUST_GDB} ${GDB_ARGS}" \ "${@}" |