From: Francois Fleuret Date: Sat, 25 Oct 2014 10:36:33 +0000 (+0200) Subject: Cleanup. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=775b3961c65aa914a728c3fb987f81f1febd04bf;p=scripts.git Cleanup. --- diff --git a/bashrc b/bashrc index 1477774..72edf83 100644 --- a/bashrc +++ b/bashrc @@ -132,13 +132,8 @@ function ding () { fi } -# alias kj="keyjnote -s -D 1000 -t Crossfade -T 100" alias impressive="impressive -s -D 1000 -t Crossfade -T 100" -# alias fdupes='fdupes -r .' - -# ls colors - if [ -e "${HOME}/.dircolors" ]; then eval $(dircolors "${HOME}/.dircolors") alias ls='ls -p --group-directories-first --color' @@ -164,17 +159,10 @@ export GIT_EDITOR=${EDITOR} # export FIGNORE="CVS" function latexdiff () { - # wdiff -n \ - # -w $'\033[30;43m'"[$1]"$'\033[30;41m ' -x $'\033[0m' \ - # -y $'\033[30;43m'"[$2]"$'\033[30;42m ' -z $'\033[0m' \ - # $* - wdiff -n \ -w $'\033[30;41m' -x $'\033[0m' \ -y $'\033[30;42m' -z $'\033[0m' \ $* - - # | \grep $'\033'"\|section{" } # Looks for the most recent .log and pdflatex + bibtex the @@ -342,32 +330,6 @@ function trash () { echo "Trashed $@" } -function mmsget () { - mplayer "$1" -dumpstream -dumpfile $(basename "$1") -} - -###################################################################### -# http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/ - -function map () { - local command i rep - if [ $# -lt 2 ] || [[ ! "$@" =~ :[[:space:]] ]];then - echo "Invalid syntax." >&2; return 1 - fi - until [[ "$1" =~ : ]]; do - command="$command $1"; shift - done - command="$command ${1%:}"; shift - for i in "$@"; do - if [[ $command =~ \{\} ]];then - rep="${command//\{\}/\"$i\"}" - eval "${rep//\\/\\\\}" - else - eval "${command//\\/\\\\} \"${i//\\/\\\\}\"" - fi - done -} - ###################################################################### ## A version of pho which stores the image numbers in environment ## variables @@ -413,34 +375,37 @@ function dt () { [ ${NETUP_HISTORY} ] || NETUP_HISTORY="${HOME}/.netup_history" function netup () { - WIFI_INTERFACE=wlan0 + local upped_wifi + + [ "${WIFI_INTERFACE}" ] || WIFI_INTERFACE=wlan0 - if [ $1 == "--scan" ]; then - if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then + if [ "$1" == "--scan" ]; then + if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then sudo ifconfig ${WIFI_INTERFACE} up - UPPED_WIFI=1 + upped_wifi=1 fi 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 + unset upped_wifi fi return 0 fi - if ifconfig -s | grep -q -v ^'(Iface|lo) '; then - echo "There is already interface(s) up." >&2 + if \ifconfig -s | grep -q -v ^'(Iface|lo) '; then + echo "There is/are already interface(s) up." >&2 return 1 fi - if [[ $(\ps -C dhclient | tail -n +2) ]]; then + if \ps h -C dhclient | grep -q .; then echo "There is already a dhcp client running." >&2 return 1 fi - if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then + if \ps h -C wpa_supplicant | grep -q .; then echo "There is already a wpa_supplicant running." >&2 return 1 fi @@ -522,12 +487,6 @@ function lr () { cut -b1-${WIDTH} } -###################################################################### -# cd and ls into a directory -# [from http://www.oreillynet.com/onlamp/blog/2007/01/whats_in_your_bash_history.html] - -function c () { cd "$@" && lr; } - ###################################################################### # You can change the xterm background color on the fly! @@ -571,17 +530,6 @@ function keep () { fi } -# 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 -# } - ###################################################################### # I sometime burn CDs and DVDs @@ -664,22 +612,6 @@ function ripdvd () { alias ripcd=abcde -###################################################################### -# Upload the sources from the current directory to work - -function ulsrc () { - if [ ! "${MY_WORK_MACHINE}" ]; then - echo "\$MY_WORK_MACHINE undefined" 1>&2 - return 1 - fi - - DIR=${PWD/$HOME\//} - - scp {Makefile,*.{cc,h,sh}} ${MY_WORK_MACHINE}:${DIR} - - echo "Uploaded to ${MY_WORK_MACHINE}:${DIR}/" -} - ###################################################################### # Create small images from images @@ -713,32 +645,6 @@ function mksmall () { if [ -e ${DEST_DIR}/$i ]; then echo "The file ${DEST_DIR}/$i already exists." else - - # orientation=$(exif $i \ - # | grep ^Orientation \ - # | head -1 \ - # | sed -e "s/^[^|]*|//" \ - # | sed -e "s/ *$//") - - # case ${orientation} in - # ""|"top - left") - # rotation_cmd="" - # ;; - - # "right - top") - # rotation_cmd="-rotate 90" - # ;; - - # "left - bottom") - # rotation_cmd="-rotate 270" - # ;; - - # *) - # rotation_cmd="" - # echo "Unknown orientation \"${orientation}\" !" - # ;; - # esac - if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video" else @@ -772,78 +678,6 @@ function mvtoconfig () { fi } -###################################################################### -# Track uncommited files (I presume this is very ugly from a real git -# user perspective) - -function git-fm () { - CURRENT_DIR=$(pwd) - NB_SUBDIR=0 - - for i in $(find -name ".git"); do - NB_SUBDIR=$((NB_SUBDIR+1)) - cd ${CURRENT_DIR}/$(dirname $i) - NB_MODIFIED=$(git status | grep modified | wc -l) - if [[ ${NB_MODIFIED} -gt 0 ]]; then - echo "$(dirname $i) (${NB_MODIFIED})" - git status | grep modified \ - | sed -e "s/^#\t/ /" | sed -e "s/modified: *//" - fi - done - - cd ${CURRENT_DIR} - - echo "Visited ${NB_SUBDIR} directories." -} - -# Update all the directories provided as argument in their respective -# versionning systems (SVN and GIT for now) - -function vcup () { - if [[ "$1" ]]; then - while [[ "$1" ]]; do - pushd > /dev/null "$1" - if [[ -d ".git" ]]; then - echo "${PWD} is under GIT" - git pull - elif [[ -d ".svn" ]]; then - echo "${PWD} is under SVN" - svn update - else - echo "No known versioning system here." - fi - popd > /dev/null - shift - done - cd ${CURRENT} - else - vcup . - fi -} - -###################################################################### -# Downloads torrents located in ${BT_DIR}/torrents/ and puts the -# result in the ${BT_DIR} - -function bt () { - if [[ ${BT_DIR} ]]; then - if [[ -d "${BT_DIR}/torrents" ]]; then - if [[ "$1" ]]; then - mv "$1" ${BT_DIR}/torrents - fi - if [[ "$(ps auxwww | grep btlaunchmanycurses | grep -v grep)" ]]; then - echo "A client is already running." - else - cd ${BT_DIR} && screen btlaunchmanycurses torrents --max_upload_rate 32 - fi - else - echo "Directory ${BT_DIR}/torrents does not exist." - fi - else - echo "You have to set \$BT_DIR." - fi -} - ###################################################################### # The complex prompt policy @@ -928,26 +762,6 @@ function histfile_cue () { PS1="\[${VT_YELLOW_BG}\]\${HISTORY_CUE}\[${VT_RESET}\]${PS1}" -###################################################################### - -# parse_git_branch () { -# git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' -# } - -# parse_git_tag () { -# git describe --tags 2> /dev/null -# } - -# parse_git_branch_or_tag() { -# local OUT="$(parse_git_branch)" -# if [ "$OUT" == " ((no branch))" ]; then -# OUT="($(parse_git_tag))"; -# fi -# echo $OUT -# } - -# PS1="${PS1}\$(parse_git_branch_or_tag)" - ###################################################################### # The dus command is available on my web site #