~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/bashrc: Some hacking for Sailfish.
[profile]
/
dot
/
bashrc
diff --git
a/dot/bashrc
b/dot/bashrc
index
f6b7a56
..
1b6d7af
100644
(file)
--- a/
dot/bashrc
+++ b/
dot/bashrc
@@
-1,4
+1,4
@@
-### -*-sh-*-
+### -*-
ba
sh-*-
###
### Bash session things
###
### Bash session things
@@
-24,6
+24,7
@@
__mdw_bashrc=done
if [ -t 0 ]; then
## Fancy highlighting in some terminals.
if [ -t 0 ]; then
## Fancy highlighting in some terminals.
+ marker=${STY+'\[
\e
k
\e
\\\]'}
case "$TERM" in
linux*|screen*|xterm*|vt100*|eterm*)
case "$(tput bold)" in
case "$TERM" in
linux*|screen*|xterm*|vt100*|eterm*)
case "$(tput bold)" in
@@
-44,7
+45,7
@@
if [ -t 0 ]; then
right=`echo » | iconv -f UTF-8 -t //translit`
else
case $USER in
right=`echo » | iconv -f UTF-8 -t //translit`
else
case $USER in
- mdw|mwooding) u="" left="[" right="]" ;;
+ mdw|mwooding
|nemo
) u="" left="[" right="]" ;;
*) u="\\u@" left="{" right="}" ;;
esac
if [ "$__mdw_tty" = "`tty`" ]; then
*) u="\\u@" left="{" right="}" ;;
esac
if [ "$__mdw_tty" = "`tty`" ]; then
@@
-62,7
+63,7
@@
if [ -t 0 ]; then
fi
## Build the prompt string.
fi
## Build the prompt string.
- PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$right$unbold"
+ PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$
marker$
right$unbold"
PS2="$PS1 $bold>$unbold "
fi
PS2="$PS1 $bold>$unbold "
fi
@@
-81,7
+82,7
@@
shopt -s cmdhist
shopt -u dotglob
shopt -s expand_aliases
shopt -s extglob
shopt -u dotglob
shopt -s expand_aliases
shopt -s extglob
-shopt -s globstar
+if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
shopt -s gnu_errfmt
shopt -s histappend
shopt -s histreedit
shopt -s gnu_errfmt
shopt -s histappend
shopt -s histreedit
@@
-130,7
+131,7
@@
else
unset LS_COLORS
fi
unset LS_COLORS
fi
-ls () {
+
unalias ls 2>/dev/null || :; function
ls () {
if [ -t 1 ]; then
command ls $LS_OPTIONS ${LS_COLORS+--color=auto} "$@"
else
if [ -t 1 ]; then
command ls $LS_OPTIONS ${LS_COLORS+--color=auto} "$@"
else