iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes and alert improvements
[distro-setup]
/
brc
diff --git
a/brc
b/brc
index 00a486219e79bfded2f5a0de6983d5aae09966e5..e0f2a883d209344e04e4c5a7d4b4bc9cd46d0726 100644
(file)
--- a/
brc
+++ b/
brc
@@
-397,19
+397,29
@@
b() {
c -
}
c -
}
-vp9() {
- in=$PWD/$1
+hexipv4() {
+ printf '%d.%d.%d.%d\n' $(echo $1 | sed 's/../0x& /g')
+}
- if [[ $2 ]]; then
- out=$PWD/$2
- else
- out=$PWD/vp9/$1
- fi
- cd $(mktemp -d)
- pwd
- ffmpeg -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 1 -an -f null /dev/null && \
- ffmpeg -y -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 2 -c:a libvorbis -qscale:a 5 $out
- cd -
+vp9() {
+ local f out outdir in
+ outdir=vp9
+ case $1 in
+ --out)
+ outdir=$2
+ shift 2
+ ;;
+ esac
+ m mkdir -p $outdir
+ for f; do
+ out=$PWD/$outdir/$f
+ in=$PWD/$f
+ m cd $(mktemp -d)
+ pwd
+ m ffmpeg -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 1 -an -f null /dev/null
+ m ffmpeg -y -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 2 -c:a libvorbis -qscale:a 5 $out
+ cd -
+ done
}
utcl() { # utc 24 hour time to local hour 24 hour time
}
utcl() { # utc 24 hour time to local hour 24 hour time
@@
-474,7
+484,17
@@
chrbind() {
for d in dev proc sys dev/pts; do
[[ -d $d ]]
if ! mountpoint $d &>/dev/null; then
for d in dev proc sys dev/pts; do
[[ -d $d ]]
if ! mountpoint $d &>/dev/null; then
- s mount -o bind /$d $d
+ m s mount -o bind /$d $d
+ fi
+ done
+}
+chumount() {
+ local d
+ # dev/pts needed for pacman signature check
+ for d in dev proc sys dev/pts; do
+ [[ -d $d ]]
+ if mountpoint $d &>/dev/null; then
+ m s umount $d
fi
done
}
fi
done
}
@@
-1001,6
+1021,11
@@
ic() {
git commit -am "$*"
}
git commit -am "$*"
}
+ipp() {
+ git pull
+ git push
+}
+
ifn() {
# insensitive find
ifn() {
# insensitive find
@@
-1626,7
+1651,6
@@
sl() {
return 1
fi
return 1
fi
- now=$(date +%s)
dorsync=false
haveinfo=false
tmpa=($SL_INFO_DIR/???????????"$remote")
dorsync=false
haveinfo=false
tmpa=($SL_INFO_DIR/???????????"$remote")
@@
-1684,7
+1708,7
@@
sl() {
RSYNC_RSH="ssh ${args[*]}" m rsync -rptL --delete $sl_rsync_args $SL_FILES_DIR "$remote":
fi
if $dorsync || ! $haveinfo; then
RSYNC_RSH="ssh ${args[*]}" m rsync -rptL --delete $sl_rsync_args $SL_FILES_DIR "$remote":
fi
if $dorsync || ! $haveinfo; then
- sshinfo=$SL_INFO_DIR/$
now
$type"$remote"
+ sshinfo=$SL_INFO_DIR/$
EPOCHSECONDS
$type"$remote"
[[ -e $SL_INFO_DIR ]] || mkdir -p $SL_INFO_DIR
printf "%s\n" "$extra_info" >$sshinfo
chmod 666 $sshinfo
[[ -e $SL_INFO_DIR ]] || mkdir -p $SL_INFO_DIR
printf "%s\n" "$extra_info" >$sshinfo
chmod 666 $sshinfo
@@
-1920,8
+1944,7
@@
s/^\Wcapability: (.*)/\1/;Ta;h;b
# * misc stuff
# * misc stuff
-if $use_color; then
-
+if $use_color && type -p tput &>/dev/null; then
term_bold="$(tput bold)"
term_red="$(tput setaf 1)"
term_green="$(tput setaf 2)"
term_bold="$(tput bold)"
term_red="$(tput setaf 1)"
term_green="$(tput setaf 2)"
@@
-1933,7
+1956,6
@@
if $use_color; then
# term_underl="$(tput smul)"
# term_blue="$(tput setaf 4)"
# term_cyan="$(tput setaf 6)"
# term_underl="$(tput smul)"
# term_blue="$(tput setaf 4)"
# term_cyan="$(tput setaf 6)"
-
fi
# Try to keep environment pollution down, EPA loves us.
unset safe_term match_lhs use_color
fi
# Try to keep environment pollution down, EPA loves us.
unset safe_term match_lhs use_color
@@
-2010,7
+2032,7
@@
if [[ $- == *i* ]]; then
if [[ -e /dev/shm/iank-status && ! -e /tmp/quiet-status ]]; then
eval $(< /dev/shm/iank-status)
fi
if [[ -e /dev/shm/iank-status && ! -e /tmp/quiet-status ]]; then
eval $(< /dev/shm/iank-status)
fi
- if [[
! $SSH_CLIEN
T && $MAIL_HOST != "$HOSTNAME" ]]; then
+ if [[
$MAIL_HOS
T && $MAIL_HOST != "$HOSTNAME" ]]; then
ps_char="@ $ps_char"
fi
# We could test if sudo is active with sudo -nv
ps_char="@ $ps_char"
fi
# We could test if sudo is active with sudo -nv