From 595f5209c4daeb93341e7cb05a9e45a4dd150143 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Mon, 21 Oct 2013 01:36:13 -0700 Subject: [PATCH] little fixes --- home/bashrc | 2 ++ home/shrc.zsh | 1 - sh/conv | 1 + sh/monitor | 5 +++-- sh/unconv | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/home/bashrc b/home/bashrc index 4724e83..f10d041 100644 --- a/home/bashrc +++ b/home/bashrc @@ -32,4 +32,6 @@ PROMPT_COMMAND='[ $? = 0 ] && PS1=${ret_succ} || PS1=${ret_fail}' # this doesn't work for all scripts at the moment, but ADDPATH "$HOME/sh" +alias reload='exec bash' + unset x diff --git a/home/shrc.zsh b/home/shrc.zsh index 88e14ba..29dcbae 100644 --- a/home/shrc.zsh +++ b/home/shrc.zsh @@ -66,6 +66,5 @@ alias unwrap='awk '\''BEGIN{RS="\n\n";FS="\n"}{for(i=1;i<=NF;i++)printf "%s ",$i alias picky='{ pacman -Qgq base base-devel | tee -; pacman -Qtnq; } | sort | uniq -u' alias unused='{ pacman -Qt; pacman -Qe | tee -; } | sort | uniq -u' -#. ~/mingw.sh . ~/sh/lsf.sh/lsf.sh . ~/sh/z/z.sh diff --git a/sh/conv b/sh/conv index 3f708a7..d6a2ca1 100644 --- a/sh/conv +++ b/sh/conv @@ -2,3 +2,4 @@ conv() { printf "%08x\n" $(((0x$1-0x4F920000+0x80000000)^3)) } +conv $1 diff --git a/sh/monitor b/sh/monitor index 339d185..ba24d9f 100755 --- a/sh/monitor +++ b/sh/monitor @@ -1,17 +1,17 @@ #!/bin/zsh monitor() { local time=$1 + local cmd=$2 local lines=0 local elines=0 local stop=0 - shift trap stop=1 INT while [ $stop -eq 0 ]; do [ $lines -gt 1 ] && echo -en "\e[${lines}A" [ $elines -gt 0 ] && echo -en "\e[${elines}A" lines=0 elines=0 - ($@ | fold -w $COLUMNS | while read -r; do + ($cmd | fold -w $COLUMNS | while read -r; do echo -E "$REPLY" let lines++ done) 2>&1 | fold -w $COLUMNS | while read -r; do @@ -21,3 +21,4 @@ monitor() { sleep $time || break done } +monitor $1 $2 diff --git a/sh/unconv b/sh/unconv index 20f114b..87ee0ef 100644 --- a/sh/unconv +++ b/sh/unconv @@ -2,3 +2,4 @@ unconv() { printf "%08x\n" $(((0x$1^3)&0x00FFFFFF+0x4F920000)) } +unconv $1