projects
/
scripts.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5675815
)
Started to remove the [[s.
author
Francois Fleuret
<francois@fleuret.org>
Wed, 27 Aug 2014 12:18:26 +0000
(14:18 +0200)
committer
Francois Fleuret
<francois@fleuret.org>
Wed, 27 Aug 2014 12:18:26 +0000
(14:18 +0200)
bashrc
patch
|
blob
|
history
diff --git
a/bashrc
b/bashrc
index
0ce1e40
..
1477774
100644
(file)
--- a/
bashrc
+++ b/
bashrc
@@
-48,7
+48,7
@@
shopt -s histappend
# interactive mode. This should maybe be done more properly through
# using different .bash_profile and .bash_login
# interactive mode. This should maybe be done more properly through
# using different .bash_profile and .bash_login
-[
[ ${TERM} == "dumb" ]
] || [ ! -t 0 ] && return
+[
${TERM} == "dumb"
] || [ ! -t 0 ] && return
# Remove the annoying beeps in console
# Remove the annoying beeps in console
@@
-123,7
+123,7
@@
function nh () {
}
function ding () {
}
function ding () {
- if [
[ $1 && $(which winshepherd.sh) ]]
; then
+ if [
$1 ] && which winshepherd.sh
; then
play -q ~/local/sounds/deskbell.wav &
unset E_APP_WINDOW
winshepherd.sh message green "$1"
play -q ~/local/sounds/deskbell.wav &
unset E_APP_WINDOW
winshepherd.sh message green "$1"
@@
-183,20
+183,20
@@
function latexdiff () {
function rl () {
RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1)
function rl () {
RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1)
- if [
[ ${RECENT_LOG} ]
]; then
+ if [
${RECENT_LOG}
]; then
FILEBASE="${RECENT_LOG/.log/}"
FILEBASE="${RECENT_LOG/.log/}"
- if [
[ -f "${FILEBASE}.tex" ]
]; then
+ if [
-f "${FILEBASE}.tex"
]; then
pdflatex "${FILEBASE}"
bibtex "${FILEBASE}"
pdflatex "${FILEBASE}"
pdflatex "${FILEBASE}"
pdflatex "${FILEBASE}"
bibtex "${FILEBASE}"
pdflatex "${FILEBASE}"
pdflatex "${FILEBASE}"
- if [
[ "$1" ]
]; then
- if [
[ "$1" == "-v" ]] || [[ "$1" == "--view" ]
]; then
+ if [
"$1"
]; then
+ if [
"$1" == "-v" ] || [ "$1" == "--view"
]; then
xpdf "${FILEBASE}.pdf"
xpdf "${FILEBASE}.pdf"
- elif [
[ "$1" == "-p" ]] || [[ "$1" == "--print" ]
]; then
+ elif [
"$1" == "-p" ] || [ "$1" == "--print"
]; then
lpr "${FILEBASE}.pdf"
else
echo "Usage: rl [-v|--view] [-p|--print]" >&2
lpr "${FILEBASE}.pdf"
else
echo "Usage: rl [-v|--view] [-p|--print]" >&2
@@
-222,6
+222,20
@@
function rl () {
######################################################################
# Functions
######################################################################
# Functions
+# http://www.reddit.com/r/linux/comments/2cgu5k/a_handy_little_script_for_interacting_with_your/
+function clip () {
+ if [ -t 0 ] && [ -z "$1" ]; then
+ # output contents of clipboard
+ xclip -out -selection clipboard || exit 1
+ elif [ "$1" ]; then
+ # copy file contents to clipboard
+ xclip -in -selection clipboard < "$1" || exit 1
+ else
+ # copy stdin to clipboard
+ xclip -in -selection clipboard <&0 || exit 1
+ fi
+}
+
# Find a file whose name contains a substring
function fn () {
# Find a file whose name contains a substring
function fn () {
@@
-231,7
+245,7
@@
function fn () {
}
function bak () {
}
function bak () {
- while [
[ "$1" ]
]; do
+ while [
"$1"
]; do
cp "$1" "$1".bak
shift
done
cp "$1" "$1".bak
shift
done
@@
-239,9
+253,9
@@
function bak () {
function ua () {
function ua () {
- [
[ "$1" ]
] || ( echo "Universal unarchive: ua <file> [<file> ...]" >&2 && return 1)
+ [
"$1"
] || ( echo "Universal unarchive: ua <file> [<file> ...]" >&2 && return 1)
- while [
[ "$1" ]
]; do
+ while [
"$1"
]; do
case "$1" in
*.tgz|*.tar.gz|*.tbz|*.tar.bz2)
case "$1" in
*.tgz|*.tar.gz|*.tbz|*.tar.bz2)
@@
-276,13
+290,13
@@
function mcd () {
# Capture the screen in a dated png
function cap () {
# Capture the screen in a dated png
function cap () {
- if [
[ $2 ]
]; then
+ if [
$2
]; then
name=$2
else
name="capture-$(date +%s).png"
fi
echo "Waiting $1 s and saving to ${name}."
name=$2
else
name="capture-$(date +%s).png"
fi
echo "Waiting $1 s and saving to ${name}."
- [
[ "$1" ]
] && sleep "$1"
+ [
"$1"
] && sleep "$1"
echo "Please click on the window to capture."
xwd | convert - ${name}
\ls -l ${name}
echo "Please click on the window to capture."
xwd | convert - ${name}
\ls -l ${name}
@@
-292,8
+306,8
@@
function cap () {
# arguments, do not create one and CD in the most recent instead
function cdt () {
# arguments, do not create one and CD in the most recent instead
function cdt () {
- if [
[ "$1" ]
]; then
- if [
[ "$1" == "-" ]
]; then
+ if [
"$1"
]; then
+ if [
"$1" == "-"
]; then
cd $(\ls -td /tmp/tmp.?????? | head -1)
else
echo "USAGE: cdt [-]" >&2
cd $(\ls -td /tmp/tmp.?????? | head -1)
else
echo "USAGE: cdt [-]" >&2
@@
-302,10
+316,10
@@
function cdt () {
else
dir=$(mktemp -d /tmp/tmp.XXXXXX)
link=/tmp/tmp
else
dir=$(mktemp -d /tmp/tmp.XXXXXX)
link=/tmp/tmp
- if [
[ -h ${link} ]
]; then
+ if [
-h ${link}
]; then
\rm ${link}
fi
\rm ${link}
fi
- if [
[ ! -a ${link} ]
]; then
+ if [
! -a ${link}
]; then
ln -s ${dir} ${link}
fi
cd ${dir}
ln -s ${dir} ${link}
fi
cd ${dir}
@@
-320,8
+334,9
@@
function trash () {
mkdir -p ${TRASH}
mkdir -p ${TRASH}
- [[ -h ${LINK} ]] && \rm ${LINK}
- [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK}
+ [ -h ${LINK} ] && \rm ${LINK}
+
+ [ ! -f ${LINK} ] && ln -s ${TRASH} ${LINK}
mv "$@" ${TRASH}
echo "Trashed $@"
mv "$@" ${TRASH}
echo "Trashed $@"
@@
-366,12
+381,12
@@
function pho () {
PHO_NOTE_R90=$(grep ^"Rotate 90 \(CW\): " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R180=$(grep ^"Rotate 180: " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R270=$(grep ^"Rotate -90 \(CCW\): " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R90=$(grep ^"Rotate 90 \(CW\): " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R180=$(grep ^"Rotate 180: " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R270=$(grep ^"Rotate -90 \(CCW\): " ${TEMP} | sed -e "s/^[^:]*: //")
- [
[ "${PHO_NOTE_1}" ]
] || unset PHO_NOTE_1
- [
[ "${PHO_NOTE_2}" ]
] || unset PHO_NOTE_2
- [
[ "${PHO_NOTE_3}" ]
] || unset PHO_NOTE_3
- [
[ "${PHO_NOTE_R90}" ]
] || unset PHO_NOTE_R90
- [
[ "${PHO_NOTE_R180}" ]
] || unset PHO_NOTE_R180
- [
[ "${PHO_NOTE_R270}" ]
] || unset PHO_NOTE_R270
+ [
"${PHO_NOTE_1}"
] || unset PHO_NOTE_1
+ [
"${PHO_NOTE_2}"
] || unset PHO_NOTE_2
+ [
"${PHO_NOTE_3}"
] || unset PHO_NOTE_3
+ [
"${PHO_NOTE_R90}"
] || unset PHO_NOTE_R90
+ [
"${PHO_NOTE_R180}"
] || unset PHO_NOTE_R180
+ [
"${PHO_NOTE_R270}"
] || unset PHO_NOTE_R270
\rm ${TEMP}
}
\rm ${TEMP}
}
@@
-380,7
+395,7
@@
function pho () {
function dt () {
echo "Local: $(date)"
function dt () {
echo "Local: $(date)"
- if [
[ ${TZ} ]
]; then
+ if [
${TZ}
]; then
unset TZ
echo "Home: $(date)"
fi
unset TZ
echo "Home: $(date)"
fi
@@
-395,12
+410,12
@@
function dt () {
## When invoked without an argument netdown removes the last interface
## which was netuped
## When invoked without an argument netdown removes the last interface
## which was netuped
-[
[ ${NETUP_HISTORY} ]
] || NETUP_HISTORY="${HOME}/.netup_history"
+[
${NETUP_HISTORY}
] || NETUP_HISTORY="${HOME}/.netup_history"
function netup () {
WIFI_INTERFACE=wlan0
function netup () {
WIFI_INTERFACE=wlan0
- if [
[ $1 == "--scan" ]
]; then
+ if [
$1 == "--scan"
]; then
if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then
sudo ifconfig ${WIFI_INTERFACE} up
UPPED_WIFI=1
if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then
sudo ifconfig ${WIFI_INTERFACE} up
UPPED_WIFI=1
@@
-408,14
+423,14
@@
function netup () {
sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//'
sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//'
- if [
[ ${UPPED_WIFI} ]
]; then
+ if [
${UPPED_WIFI}
]; then
sudo ifconfig ${WIFI_INTERFACE} down
fi
return 0
fi
sudo ifconfig ${WIFI_INTERFACE} down
fi
return 0
fi
- if
[[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]
; then
+ if
ifconfig -s | grep -q -v ^'(Iface|lo) '
; then
echo "There is already interface(s) up." >&2
return 1
fi
echo "There is already interface(s) up." >&2
return 1
fi
@@
-430,7
+445,7
@@
function netup () {
return 1
fi
return 1
fi
- if [
[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]
]; then
+ if [
! "$@" ] && [ -s ${NETUP_HISTORY}
]; then
echo "netup <interface>" >&2
return 1
# # If we have no argument and there is a .netup_history, use it
echo "netup <interface>" >&2
return 1
# # If we have no argument and there is a .netup_history, use it
@@
-441,7
+456,7
@@
function netup () {
echo ${ARGS} > ${NETUP_HISTORY}
fi
echo ${ARGS} > ${NETUP_HISTORY}
fi
- if [
[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]
]; then
+ if [
"${PRIVATE_INTERFACE_DEFINITION}"
]; then
ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
fi
ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
fi
@@
-454,14
+469,14
@@
function netup () {
REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh
# REMOVE_LOCAL_DNS=${HOME}/sources/scripts/remove-local-dns.sh
REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh
# REMOVE_LOCAL_DNS=${HOME}/sources/scripts/remove-local-dns.sh
- if [
[ -x ${REMOVE_LOCAL_DNS} ]
]; then
+ if [
-x ${REMOVE_LOCAL_DNS}
]; then
echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
sudo ${REMOVE_LOCAL_DNS} 192.168
fi
}
function netdown () {
echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
sudo ${REMOVE_LOCAL_DNS} 192.168
fi
}
function netdown () {
- if [
[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]
]; then
+ if [
! "$@" ] && [ -s ${NETUP_HISTORY}
]; then
# If there are no arguments and there is a .netup_history, get the
# interface from it
ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//")
# If there are no arguments and there is a .netup_history, get the
# interface from it
ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//")
@@
-470,9
+485,7
@@
function netdown () {
ARGS="$@"
fi
ARGS="$@"
fi
- if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
- ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
- fi
+ [ "${PRIVATE_INTERFACE_DEFINITION}" ] && ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}"
sudo ifdown ${ARGS}
echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}"
sudo ifdown ${ARGS}
@@
-490,7
+503,7
@@
function netdown () {
function checkgw () {
GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}')
function checkgw () {
GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}')
- if [
[ -n "${GW}" ]
]; then
+ if [
"${GW}"
]; then
ping ${GW}
else
echo "Can not find a getaway." >&2
ping ${GW}
else
echo "Can not find a getaway." >&2
@@
-527,7
+540,7
@@
function setxtermbg () {
function shuffle () {
SEED=$1
function shuffle () {
SEED=$1
- [
[ $SEED ]
] || SEED=0
+ [
$SEED
] || SEED=0
awk 'BEGIN{srand('${SEED}')} { print rand()" "$0 }' | sort -g | sed -e "s/^[0-9\.e\-]* //"
}
awk 'BEGIN{srand('${SEED}')} { print rand()" "$0 }' | sort -g | sed -e "s/^[0-9\.e\-]* //"
}
@@
-537,15
+550,15
@@
function shuffle () {
KEPT_COMMANDS=${HOME}/.kept_bash_commands
function keep () {
KEPT_COMMANDS=${HOME}/.kept_bash_commands
function keep () {
- if [
[ ${KEPT_COMMANDS} ]
]; then
+ if [
${KEPT_COMMANDS}
]; then
TOKEEP=$(mktemp /tmp/keep.XXXXXX)
TOKEEP=$(mktemp /tmp/keep.XXXXXX)
- if [
[ "$*" ]
]; then
+ if [
"$*"
]; then
echo "$*" > ${TOKEEP}
else
selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history)
fi
echo "$*" > ${TOKEEP}
else
selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history)
fi
- if [
[ -s "${TOKEEP}" ]
]; then
+ if [
-s "${TOKEEP}"
]; then
echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS}
cat "${TOKEEP}"
else
echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS}
cat "${TOKEEP}"
else
@@
-559,14
+572,14
@@
function keep () {
}
# function keep () {
}
# function keep () {
-
# if [[ ${KEPT_COMMANDS} ]]; then
-
# LINE="$*"
-
# [[ "${LINE}" ]] || LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
-
# echo $LINE
-
# echo $(date)": "${LINE} >> ${KEPT_COMMANDS}
-
# else
-
# echo "You have to set \$KEPT_COMMANDS"
-
# fi
+# if [[ ${KEPT_COMMANDS} ]]; then
+# LINE="$*"
+# [[ "${LINE}" ]] || LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
+# echo $LINE
+# echo $(date)": "${LINE} >> ${KEPT_COMMANDS}
+# else
+# echo "You have to set \$KEPT_COMMANDS"
+# fi
# }
######################################################################
# }
######################################################################
@@
-574,16
+587,16
@@
function keep () {
function burn () {
DEVICE="/dev/cdrw1"
function burn () {
DEVICE="/dev/cdrw1"
- if [
[ ! "$1" ]
]; then
+ if [
! "$1"
]; then
echo "burn <iso name | dirname>" >&2
echo "burn <iso name | dirname>" >&2
- elif [
[ -f "$1" ]
]; then
+ elif [
-f "$1"
]; then
if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then
wodim -eject -v dev=${DEVICE} "$1"
else
echo "Do not know what to do with $1" >&2
fi
if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then
wodim -eject -v dev=${DEVICE} "$1"
else
echo "Do not know what to do with $1" >&2
fi
- elif [
[ -d "$1" ]
]; then
- [
[ "${TMP_ROOT}" ]
] || TMP_ROOT=/tmp/
+ elif [
-d "$1"
]; then
+ [
"${TMP_ROOT}"
] || TMP_ROOT=/tmp/
echo "Using ${TMP_ROOT} as temporary directory."
TMP=$(mktemp ${TMP_ROOT}/cdimage.XXXXXX) && \
genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \
echo "Using ${TMP_ROOT} as temporary directory."
TMP=$(mktemp ${TMP_ROOT}/cdimage.XXXXXX) && \
genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \
@@
-607,7
+620,7
@@
function dvd () {
echo " / * Volume"
echo
echo " / * Volume"
echo
- if [
[ "$1" ]
]; then
+ if [
"$1"
]; then
dvd_device="$1"
shift
else
dvd_device="$1"
shift
else
@@
-616,7
+629,7
@@
function dvd () {
title="1"
title="1"
- if [
[ "$1" ]
]; then
+ if [
"$1"
]; then
title=$1
shift
fi
title=$1
shift
fi
@@
-632,9
+645,9
@@
function dvd () {
}
function ripdvd () {
}
function ripdvd () {
- if [
[ -e "/dev/dvd" ]
]; then
+ if [
-e "/dev/dvd"
]; then
DVD_DEVICE="/dev/dvd"
DVD_DEVICE="/dev/dvd"
- elif [
[ -e "/dev/dvd3" ]
]; then
+ elif [
-e "/dev/dvd3"
]; then
DVD_DEVICE="/dev/dvd3"
else
echo "Can not find the dvd device." >&2
DVD_DEVICE="/dev/dvd3"
else
echo "Can not find the dvd device." >&2
@@
-655,7
+668,7
@@
alias ripcd=abcde
# Upload the sources from the current directory to work
function ulsrc () {
# Upload the sources from the current directory to work
function ulsrc () {
- if [
[ ! "${MY_WORK_MACHINE}" ]
]; then
+ if [
! "${MY_WORK_MACHINE}"
]; then
echo "\$MY_WORK_MACHINE undefined" 1>&2
return 1
fi
echo "\$MY_WORK_MACHINE undefined" 1>&2
return 1
fi
@@
-683,11
+696,11
@@
function mksmall () {
DEST_DIR=$1
DEST_DIR=$1
- [
[ ${DEST_DIR} ]
] || DEST_DIR=./small
+ [
${DEST_DIR}
] || DEST_DIR=./small
mkdir -p ${DEST_DIR}
mkdir -p ${DEST_DIR}
- if [
[ ! -d ${DEST_DIR} ]
]; then
+ if [
! -d ${DEST_DIR}
]; then
echo "Can not create ${DEST_DIR}" >&2
return
fi
echo "Can not create ${DEST_DIR}" >&2
return
fi
@@
-697,7
+710,7
@@
function mksmall () {
for i in $(find -maxdepth 1 -type f); do
if [[ $(file $i | grep image) ]]; then
for i in $(find -maxdepth 1 -type f); do
if [[ $(file $i | grep image) ]]; then
- if [
[ -e ${DEST_DIR}/$i ]
]; then
+ if [
-e ${DEST_DIR}/$i
]; then
echo "The file ${DEST_DIR}/$i already exists."
else
echo "The file ${DEST_DIR}/$i already exists."
else
@@
-799,7
+812,7
@@
function vcup () {
else
echo "No known versioning system here."
fi
else
echo "No known versioning system here."
fi
- popd > /dev/null
+ popd > /dev/null
shift
done
cd ${CURRENT}
shift
done
cd ${CURRENT}
@@
-918,19
+931,19
@@
PS1="\[${VT_YELLOW_BG}\]\${HISTORY_CUE}\[${VT_RESET}\]${PS1}"
######################################################################
# parse_git_branch () {
######################################################################
# parse_git_branch () {
-
# git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
+# git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
# }
# parse_git_tag () {
# }
# parse_git_tag () {
-
# git describe --tags 2> /dev/null
+# git describe --tags 2> /dev/null
# }
# parse_git_branch_or_tag() {
# }
# parse_git_branch_or_tag() {
-
# local OUT="$(parse_git_branch)"
-
# if [ "$OUT" == " ((no branch))" ]; then
-
# OUT="($(parse_git_tag))";
-
# fi
-
# echo $OUT
+# local OUT="$(parse_git_branch)"
+# if [ "$OUT" == " ((no branch))" ]; then
+# OUT="($(parse_git_tag))";
+# fi
+# echo $OUT
# }
# PS1="${PS1}\$(parse_git_branch_or_tag)"
# }
# PS1="${PS1}\$(parse_git_branch_or_tag)"
@@
-995,7
+1008,7
@@
function lsn () {
sort -u ${TMP} > ${LSN_MEMORY}
\rm ${TMP}
sort -u ${TMP} > ${LSN_MEMORY}
\rm ${TMP}
- elif [
[ -n "$1" ]
]; then
+ elif [
"$1"
]; then
echo "lsn [--mem|-m] [+ <file> ...]" >&2
return 1
echo "lsn [--mem|-m] [+ <file> ...]" >&2
return 1