notwa/rc
1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2024-11-14 08:19:03 -08:00
Code Issues Releases Wiki Activity

more consistent indentation

Browse source
This commit is contained in:
Connor Olding 2013-07-01 18:05:17 -07:00
parent ea6c0463cf
commit ee4c02ea5b
6 changed files with 105 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init.sh
View file

@ -57,8 +57,8 @@ for r in $rc/ssh/* $rc/config/menus/*; do
hardlink "$f" "$r" hardlink "$f" "$r"
done done
grep .bashrc .bash_profile >/dev/null 2>&1 || \ grep .bashrc .bash_profile >/dev/null 2>&1 \
echo -e '\n[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile || echo -e '\n[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile
for d in Desktop Documents Downloads Music Pictures Public Templates Video; do for d in Desktop Documents Downloads Music Pictures Public Templates Video; do
[ -d "$d" ] || continue [ -d "$d" ] || continue

26
sh/confirm
View file

@ -1,18 +1,18 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ -n "${ZSH_VERSION:-}" ]; then if [ -n "${ZSH_VERSION:-}" ]; then
confirm() { confirm() {
read -q '?Continue? [Y/n] ' read -q '?Continue? [Y/n] '
ret=$? ret=$?
echo echo
return $ret return $ret
} }
else else
confirm() { confirm() {
# manually specify stdin (1) to avoid taking input from pipes # specify stdin (1) to avoid taking input from pipes
read -n1 -u 1 -p "Continue? [Y/n] " c read -n1 -u 1 -p "Continue? [Y/n] " c
echo echo
[ "$c" != 'y' ] && [ "$c" != 'Y' ] && return 1 [ "$c" != 'y' ] && [ "$c" != 'Y' ] && return 1
return 0 return 0
} }
fi fi
confirm confirm

6
sh/gitall
View file

@ -2,7 +2,7 @@
find ~ -name .git -type d \ find ~ -name .git -type d \
| grep -v '/src/\|/work/' \ | grep -v '/src/\|/work/' \
| while read -r fp; do | while read -r fp; do
cd "${fp%/.git}" cd "${fp%/.git}"
pwd pwd
confirm && git pull confirm && git pull
done done

54
sh/lsarchive
View file

@ -9,7 +9,7 @@
local verbose local verbose
if (( $# == 0 )); then if (( $# == 0 )); then
cat >&2 <<EOF cat >&2 <<EOF
usage: $0 [-option] [file ...] usage: $0 [-option] [file ...]
options: options:
@ -20,36 +20,36 @@ EOF
fi fi
if [[ "$1" == "-v" || "$1" == "--verbose" ]]; then if [[ "$1" == "-v" || "$1" == "--verbose" ]]; then
verbose=0 verbose=0
shift shift
fi fi
while (( $# > 0 )); do while (( $# > 0 )); do
if [[ ! -s "$1" ]]; then if [[ ! -s "$1" ]]; then
print "$0: file not valid: $1" >&2 print "$0: file not valid: $1" >&2
shift shift
continue continue
fi fi
case "$1" in case "$1" in
(*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;; (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
(*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;; (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \ (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
&& tar --xz -t${verbose:+v}f "$1" \ && tar --xz -t${verbose:+v}f "$1" \
|| xzcat "$1" | tar t${verbose:+v}f - ;; || xzcat "$1" | tar t${verbose:+v}f - ;;
(*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \ (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
&& tar --lzma -t${verbose:+v}f "$1" \ && tar --lzma -t${verbose:+v}f "$1" \
|| lzcat "$1" | tar x${verbose:+v}f - ;; || lzcat "$1" | tar x${verbose:+v}f - ;;
(*.tar) tar t${verbose:+v}f "$1" ;; (*.tar) tar t${verbose:+v}f "$1" ;;
(*.zip) unzip -l${verbose:+v} "$1" ;; (*.zip) unzip -l${verbose:+v} "$1" ;;
(*.rar) unrar &> /dev/null \ (*.rar) unrar &> /dev/null \
&& unrar ${${verbose:+v}:-l} "$1" \ && unrar ${${verbose:+v}:-l} "$1" \
|| rar ${${verbose:+v}:-l} "$1" ;; || rar ${${verbose:+v}:-l} "$1" ;;
(*.7z) 7za l "$1" ;; (*.7z) 7za l "$1" ;;
(*) (*)
print "$0: cannot list: $1" >&2 print "$0: cannot list: $1" >&2
success=1 success=1
;; ;;
esac esac
shift shift

98
sh/unarchive
View file

@ -12,7 +12,7 @@ local file_name
local extract_dir local extract_dir
if (( $# == 0 )); then if (( $# == 0 )); then
cat >&2 <<EOF cat >&2 <<EOF
usage: $0 [-option] [file ...] usage: $0 [-option] [file ...]
options: options:
@ -24,57 +24,57 @@ fi
remove_archive=1 remove_archive=1
if [[ "$1" == "-r" || "$1" == "--remove" ]]; then if [[ "$1" == "-r" || "$1" == "--remove" ]]; then
remove_archive=0 remove_archive=0
shift shift
fi fi
while (( $# > 0 )); do while (( $# > 0 )); do
if [[ ! -s "$1" ]]; then if [[ ! -s "$1" ]]; then
print "$0: file not valid: $1" >&2 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 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 done

22
zshrc
View file

@ -79,9 +79,9 @@ bindkey '^Xe' edit-command-line # ctrl+x -> e
alias -g STFU="2>/dev/null" alias -g STFU="2>/dev/null"
for x in ack cd cp ebuild gcc gist grep ln man mkdir mv rm 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 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 if [[ "$TERM" = xterm* ]]; then
precmd() { print -Pn "\e]2;%M: %~\a" } precmd() { print -Pn "\e]2;%M: %~\a" }
@ -92,15 +92,15 @@ PROMPT='%b%(?.%2K.%1K)%15F%#%f%k '
RPROMPT='%8F%h%b' RPROMPT='%8F%h%b'
reload() { reload() {
# This doesn't seem to help with _vim_files errors, ehh # This doesn't seem to help with _vim_files errors, ehh
# you wanna rm .zcompdump then exit, that's why # you wanna rm .zcompdump then exit, that's why
cd ~ cd ~
autoload -U zrecompile autoload -U zrecompile
[ -f .zshrc ] && zrecompile -p .zshrc [ -f .zshrc ] && zrecompile -p .zshrc
rm -f .zcompdump rm -f .zcompdump
[ -f .zshrc.zwc.old ] && rm -f .zshrc.zwc.old [ -f .zshrc.zwc.old ] && rm -f .zshrc.zwc.old
[ -f .zcompdump.zwc.old ] && rm -f .zcompdump.zwc.old [ -f .zcompdump.zwc.old ] && rm -f .zcompdump.zwc.old
exec zsh # reload shell, inheriting environment exec zsh # reload shell, inheriting environment
} }
unset x unset x