From ee4c02ea5b7cc200a686cc45a904b0e9fb4dd900 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Mon, 1 Jul 2013 18:05:17 -0700 Subject: [PATCH] more consistent indentation --- init.sh | 4 +-- sh/confirm | 26 +++++++------- sh/gitall | 6 ++-- sh/lsarchive | 54 ++++++++++++++--------------- sh/unarchive | 98 ++++++++++++++++++++++++++-------------------------- zshrc | 22 ++++++------ 6 files changed, 105 insertions(+), 105 deletions(-) diff --git a/init.sh b/init.sh index bbd2232..c649679 100755 --- a/init.sh +++ b/init.sh @@ -57,8 +57,8 @@ for r in $rc/ssh/* $rc/config/menus/*; do hardlink "$f" "$r" done -grep .bashrc .bash_profile >/dev/null 2>&1 || \ - echo -e '\n[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile +grep .bashrc .bash_profile >/dev/null 2>&1 \ + || echo -e '\n[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile for d in Desktop Documents Downloads Music Pictures Public Templates Video; do [ -d "$d" ] || continue diff --git a/sh/confirm b/sh/confirm index 5e62a9b..1065c76 100755 --- a/sh/confirm +++ b/sh/confirm @@ -1,18 +1,18 @@ #!/usr/bin/env bash if [ -n "${ZSH_VERSION:-}" ]; then - confirm() { - read -q '?Continue? [Y/n] ' - ret=$? - echo - return $ret - } + confirm() { + read -q '?Continue? [Y/n] ' + ret=$? + echo + return $ret + } else - confirm() { - # manually specify stdin (1) to avoid taking input from pipes - read -n1 -u 1 -p "Continue? [Y/n] " c - echo - [ "$c" != 'y' ] && [ "$c" != 'Y' ] && return 1 - return 0 - } + confirm() { + # specify stdin (1) to avoid taking input from pipes + read -n1 -u 1 -p "Continue? [Y/n] " c + echo + [ "$c" != 'y' ] && [ "$c" != 'Y' ] && return 1 + return 0 + } fi confirm diff --git a/sh/gitall b/sh/gitall index b699412..6d73a21 100755 --- a/sh/gitall +++ b/sh/gitall @@ -2,7 +2,7 @@ find ~ -name .git -type d \ | grep -v '/src/\|/work/' \ | while read -r fp; do - cd "${fp%/.git}" - pwd - confirm && git pull + cd "${fp%/.git}" + pwd + confirm && git pull done diff --git a/sh/lsarchive b/sh/lsarchive index b9ff15b..8e9172b 100755 --- a/sh/lsarchive +++ b/sh/lsarchive @@ -9,7 +9,7 @@ local verbose if (( $# == 0 )); then - cat >&2 <&2 < 0 )); do - if [[ ! -s "$1" ]]; then - print "$0: file not valid: $1" >&2 - shift - continue - fi + if [[ ! -s "$1" ]]; then + print "$0: file not valid: $1" >&2 + shift + continue + fi - case "$1" in - (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;; - (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;; - (*.tar.xz|*.txz) tar --xz --help &> /dev/null \ - && tar --xz -t${verbose:+v}f "$1" \ - || xzcat "$1" | tar t${verbose:+v}f - ;; - (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \ - && tar --lzma -t${verbose:+v}f "$1" \ - || lzcat "$1" | tar x${verbose:+v}f - ;; - (*.tar) tar t${verbose:+v}f "$1" ;; - (*.zip) unzip -l${verbose:+v} "$1" ;; - (*.rar) unrar &> /dev/null \ - && unrar ${${verbose:+v}:-l} "$1" \ - || rar ${${verbose:+v}:-l} "$1" ;; - (*.7z) 7za l "$1" ;; - (*) - print "$0: cannot list: $1" >&2 - success=1 - ;; + case "$1" in + (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;; + (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;; + (*.tar.xz|*.txz) tar --xz --help &> /dev/null \ + && tar --xz -t${verbose:+v}f "$1" \ + || xzcat "$1" | tar t${verbose:+v}f - ;; + (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \ + && tar --lzma -t${verbose:+v}f "$1" \ + || lzcat "$1" | tar x${verbose:+v}f - ;; + (*.tar) tar t${verbose:+v}f "$1" ;; + (*.zip) unzip -l${verbose:+v} "$1" ;; + (*.rar) unrar &> /dev/null \ + && unrar ${${verbose:+v}:-l} "$1" \ + || rar ${${verbose:+v}:-l} "$1" ;; + (*.7z) 7za l "$1" ;; + (*) + print "$0: cannot list: $1" >&2 + success=1 + ;; esac shift diff --git a/sh/unarchive b/sh/unarchive index cc99156..4c2f3d0 100755 --- a/sh/unarchive +++ b/sh/unarchive @@ -12,7 +12,7 @@ local file_name local extract_dir if (( $# == 0 )); then - cat >&2 <&2 < 0 )); do - if [[ ! -s "$1" ]]; then - print "$0: file not valid: $1" >&2 + if [[ ! -s "$1" ]]; then + print "$0: file not valid: $1" >&2 + shift + continue + fi + + success=0 + file_name="${1:t}" + extract_dir="${file_name:r}" + case "$1" in + (*.tar.gz|*.tgz) tar xvzf "$1" ;; + (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;; + (*.tar.xz|*.txz) tar --xz --help &> /dev/null \ + && tar --xz -xvf "$1" \ + || xzcat "$1" | tar xvf - ;; + (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \ + && tar --lzma -xvf "$1" \ + || lzcat "$1" | tar xvf - ;; + (*.tar) tar xvf "$1" ;; + (*.gz) gunzip "$1" ;; + (*.bz2) bunzip2 "$1" ;; + (*.xz) unxz "$1" ;; + (*.lzma) unlzma "$1" ;; + (*.Z) uncompress "$1" ;; + (*.zip) unzip "$1" -d $extract_dir ;; + (*.rar) unrar &> /dev/null \ + && unrar e -ad "$1" \ + || rar e -ad "$1" ;; + (*.7z) 7za x "$1" ;; + (*.deb) + mkdir -p "$extract_dir/control" + mkdir -p "$extract_dir/data" + cd "$extract_dir"; ar vx "../${1}" > /dev/null + cd control; tar xzvf ../control.tar.gz + cd ../data; tar xzvf ../data.tar.gz + cd ..; rm *.tar.gz debian-binary + cd .. + ;; + (*) + print "$0: cannot extract: $1" >&2 + success=1 + ;; + esac + + (( success = $success > 0 ? $success : $? )) + (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1" shift - continue - fi - - success=0 - file_name="${1:t}" - extract_dir="${file_name:r}" - case "$1" in - (*.tar.gz|*.tgz) tar xvzf "$1" ;; - (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;; - (*.tar.xz|*.txz) tar --xz --help &> /dev/null \ - && tar --xz -xvf "$1" \ - || xzcat "$1" | tar xvf - ;; - (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \ - && tar --lzma -xvf "$1" \ - || lzcat "$1" | tar xvf - ;; - (*.tar) tar xvf "$1" ;; - (*.gz) gunzip "$1" ;; - (*.bz2) bunzip2 "$1" ;; - (*.xz) unxz "$1" ;; - (*.lzma) unlzma "$1" ;; - (*.Z) uncompress "$1" ;; - (*.zip) unzip "$1" -d $extract_dir ;; - (*.rar) unrar &> /dev/null \ - && unrar e -ad "$1" \ - || rar e -ad "$1" ;; - (*.7z) 7za x "$1" ;; - (*.deb) - mkdir -p "$extract_dir/control" - mkdir -p "$extract_dir/data" - cd "$extract_dir"; ar vx "../${1}" > /dev/null - cd control; tar xzvf ../control.tar.gz - cd ../data; tar xzvf ../data.tar.gz - cd ..; rm *.tar.gz debian-binary - cd .. - ;; - (*) - print "$0: cannot extract: $1" >&2 - success=1 - ;; - esac - - (( success = $success > 0 ? $success : $? )) - (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1" - shift done diff --git a/zshrc b/zshrc index 7134b4a..bdc05a6 100644 --- a/zshrc +++ b/zshrc @@ -79,9 +79,9 @@ bindkey '^Xe' edit-command-line # ctrl+x -> e alias -g STFU="2>/dev/null" for x in ack cd cp ebuild gcc gist grep ln man mkdir mv rm - alias $x="nocorrect $x" + alias $x="nocorrect $x" for x in arith fc find ftp history let locate rsync scp sftp wget - alias $x="noglob $x" + alias $x="noglob $x" if [[ "$TERM" = xterm* ]]; then precmd() { print -Pn "\e]2;%M: %~\a" } @@ -92,15 +92,15 @@ PROMPT='%b%(?.%2K.%1K)%15F%#%f%k ' RPROMPT='%8F%h%b' reload() { - # This doesn't seem to help with _vim_files errors, ehh - # you wanna rm .zcompdump then exit, that's why - cd ~ - autoload -U zrecompile - [ -f .zshrc ] && zrecompile -p .zshrc - rm -f .zcompdump - [ -f .zshrc.zwc.old ] && rm -f .zshrc.zwc.old - [ -f .zcompdump.zwc.old ] && rm -f .zcompdump.zwc.old - exec zsh # reload shell, inheriting environment + # This doesn't seem to help with _vim_files errors, ehh + # you wanna rm .zcompdump then exit, that's why + cd ~ + autoload -U zrecompile + [ -f .zshrc ] && zrecompile -p .zshrc + rm -f .zcompdump + [ -f .zshrc.zwc.old ] && rm -f .zshrc.zwc.old + [ -f .zcompdump.zwc.old ] && rm -f .zcompdump.zwc.old + exec zsh # reload shell, inheriting environment } unset x