Align shell style all over the repo
This commit is contained in:
parent
afb13d9c9c
commit
d5e71c46f7
16 changed files with 113 additions and 86 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# ZZZ
|
||||
# Written in 2019 by Lucas
|
||||
# Written in 2019-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
doas true || exit $?
|
||||
|
||||
printf "Hibernating in";
|
||||
printf "Hibernating in"
|
||||
for i in 3 2 1; do
|
||||
printf " %d..." $i
|
||||
sleep 1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# credentials
|
||||
# Written in 2019 by Lucas
|
||||
# Written in 2019-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -63,25 +63,25 @@ get_service()
|
|||
|
||||
if [ $user = no ] && [ $pass = no ] && [ $sfa = no ]; then
|
||||
sekrit has "services/$service/pass" ||
|
||||
err "Unknown service \"$service\"."
|
||||
err "unknown service $service"
|
||||
pass=yes
|
||||
sekrit has services/"$service"/user && user=yes
|
||||
sekrit has services/"$service"/2fa && sfa=yes
|
||||
sekrit has "services/$service/user" && user=yes
|
||||
sekrit has "services/$service/2fa" && sfa=yes
|
||||
fi
|
||||
|
||||
if [ $user = check ]; then
|
||||
sekrit has services/"$service"/user ||
|
||||
err "Service \"$service\" has no user."
|
||||
sekrit has "services/$service/user" ||
|
||||
err "service $service has no user"
|
||||
user=yes
|
||||
fi
|
||||
if [ $pass = check ]; then
|
||||
sekrit has services/"$service"/pass ||
|
||||
err "Service \"$service\" has no pass."
|
||||
sekrit has "services/$service/pass" ||
|
||||
err "service $service has no pass"
|
||||
pass=yes
|
||||
fi
|
||||
if [ $sfa = check ]; then
|
||||
sekrit has services/"$service"/2fa ||
|
||||
err "Service \"$service\" has no 2fa."
|
||||
sekrit has "services/$service/2fa" ||
|
||||
err "service $service has no 2fa"
|
||||
sfa=yes
|
||||
fi
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ get_raw()
|
|||
{
|
||||
key=$1
|
||||
|
||||
sekrit has "$key" || err "Unknown key \"$key\"."
|
||||
sekrit has "$key" || err "unknown key $key"
|
||||
|
||||
printf "%s" "$key"
|
||||
sekrit get "$key" | clip && printf "\n"
|
||||
|
|
@ -118,14 +118,14 @@ while getopts 2pru flag; do
|
|||
;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND - 1))
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
[ $# -eq 1 ] && [ -n "$1" ] || usage
|
||||
key=$1
|
||||
|
||||
if [ $raw = yes ]; then
|
||||
if [ $sfa != no ] || [ $pass != no ] || [ $user != no ]; then
|
||||
err "-r is mutually exclusive with -2pu."
|
||||
err "-r is mutually exclusive with -2pu"
|
||||
fi
|
||||
get_raw "$key"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ while getopts T flag; do
|
|||
;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND - 1))
|
||||
shift $((OPTIND - 1))
|
||||
[ $# -gt 0 ] || usage
|
||||
|
||||
: ${ARCHIVE_BASEDIR:=~/tmp/archive}
|
||||
mkdir -p "$ARCHIVE_BASEDIR"
|
||||
|
||||
everything=$ARCHIVE_BASEDIR/everything
|
||||
test -f "$everything" || touch "$everything"
|
||||
touch "$everything"
|
||||
|
||||
dir=$ARCHIVE_BASEDIR/$(date +%Y/%m/%d)
|
||||
mkdir -p "$dir" || exit 1
|
||||
|
|
@ -57,7 +57,7 @@ for url; do
|
|||
outdir=$dir/$sha
|
||||
|
||||
if grep -q "^$url\$" "$everything"; then
|
||||
printf "%s: \"%s\" already fetched.\n" "${0##*/}" "$url" >&2
|
||||
printf "%s: already fetched %s\n" "${0##*/}" "$url" >&2
|
||||
printf "%s/file\n" "$(find_dir "$sha")"
|
||||
continue
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# imgresize
|
||||
# Written in 2019 by Lucas
|
||||
# Written in 2019-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -29,13 +29,12 @@ err()
|
|||
|
||||
check_dimension_format()
|
||||
{
|
||||
printf "%s\n" "$1" | grep -q "^[0-9]*x[0-9]*\$" \
|
||||
&& [ "$1" != "x" ]
|
||||
printf "%s\n" "$1" | grep -q "^[0-9]*x[0-9]*\$" && [ "$1" != "x" ]
|
||||
}
|
||||
|
||||
[ $# -eq 3 ] && check_dimension_format "$1" || usage
|
||||
[ -n "$2" ] || err "Input file name can't be empty."
|
||||
[ -n "$3" ] || err "Output file name can't be empty."
|
||||
[ -n "$2" ] || err "input file name can't be empty"
|
||||
[ -n "$3" ] || err "output file name can't be empty"
|
||||
|
||||
size=$1
|
||||
w=${size%x*}
|
||||
|
|
@ -50,7 +49,7 @@ case $infile in
|
|||
;;
|
||||
*.png) inprog=pngtopam
|
||||
;;
|
||||
*) err "Unknown input format."
|
||||
*) err "unknown input format"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -61,10 +60,10 @@ case $outfile in
|
|||
;;
|
||||
*.png) outprog=pamtopng
|
||||
;;
|
||||
*) err "Unknown output format."
|
||||
*) err "unknown output format"
|
||||
;;
|
||||
esac
|
||||
|
||||
"$inprog" <"$infile" \
|
||||
| pamscale ${w:+-width "$w"} ${h:+-height "$h"} \
|
||||
| "$outprog" >"$outfile"
|
||||
$inprog <"$infile" |
|
||||
pamscale ${w:+-width "$w"} ${h:+-height "$h"} |
|
||||
$outprog >"$outfile"
|
||||
|
|
|
|||
|
|
@ -88,10 +88,10 @@ shift $((OPTIND - 1))
|
|||
[ $# -eq 1 ] || usage
|
||||
|
||||
url=$1
|
||||
known_site "$url" || err "Unknown site: $url"
|
||||
known_site "$url" || err "unknown site $url"
|
||||
|
||||
id=$(get_id "$url")
|
||||
[ ${#id} -eq 11 ] || err "invalid video ID"
|
||||
[ ${#id} -eq 11 ] || err "invalid video ID $id"
|
||||
|
||||
# XXX choose in some clever way
|
||||
itag=$(torsocks ftp -MVo - "$(api "/api/v1/videos/$id")" |
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# o
|
||||
# plumb
|
||||
# Written in 2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ err()
|
|||
check_prog()
|
||||
{
|
||||
if ! command -v "$1" >/dev/null 2>&1; then
|
||||
printf "%s: Missing required program \"%s\"\n" \
|
||||
printf "%s: missing required program %s\n" \
|
||||
"${0##*/}" "$1" >&2
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -95,6 +95,6 @@ ix.io)
|
|||
do_upload pst_ix_io "$@"
|
||||
;;
|
||||
*)
|
||||
err "Unknown service \"$srv\""
|
||||
err "unknown service $srv"
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# rfcopen
|
||||
# Written in 2019 by Lucas
|
||||
# Written in 2019-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -38,7 +38,7 @@ while getopts T flag; do
|
|||
;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND - 1))
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
[ $# -eq 1 ] && [ -n "$1" ] && n=$(tonumber "$1") || usage
|
||||
rfcfile=$RFCDIR/rfc$n.txt
|
||||
|
|
@ -46,7 +46,6 @@ url=https://tools.ietf.org/rfc/rfc$n.txt
|
|||
|
||||
mkdir -p "$RFCDIR"
|
||||
if [ ! -f "$rfcfile" ]; then
|
||||
$torsocks ftp -Vo "$rfcfile" "$url" || err "Couldn't fetch RFC $n."
|
||||
$torsocks ftp -Vo "$rfcfile" "$url" || err "couldn't fetch RFC $n"
|
||||
fi
|
||||
|
||||
${PAGER:-more} "$rfcfile"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# screenshot
|
||||
# Written in 2019 by Lucas
|
||||
# Written in 2019-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -31,14 +31,16 @@ err()
|
|||
case $# in
|
||||
0) set -- -root
|
||||
;;
|
||||
1) [ "$1" = "-window" ] || err "Unknown option \"$1\"."
|
||||
1) [ "$1" = "-window" ] || err "unknown option $1"
|
||||
set --
|
||||
;;
|
||||
2) [ "$1" = "-id" ] || [ "$1" = "-name" ] || err "Unknown option \"$1\"."
|
||||
[ -n "$2" ] || err "$1 expects a non-empty parameter."
|
||||
2) [ "$1" = "-id" ] || [ "$1" = "-name" ] || err "unknown option $1"
|
||||
[ -n "$2" ] || err "$1 expects a non-empty parameter"
|
||||
;;
|
||||
*) usage
|
||||
;;
|
||||
esac
|
||||
|
||||
xwd -silent "$@" | xwdtopnm | pnmtopng >~/media/ss/"$(date +%Y%m%d-%H%M%S)".png
|
||||
: ${SCREENSHOTS:=~/media/ss}
|
||||
xwd -silent "$@" | xwdtopnm |
|
||||
pnmtopng >"$SCREENSHOTS/$(date +%Y%m%d-%H%M%S).png"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# sekrit
|
||||
# Written in 2018-2019 by Lucas
|
||||
# Written in 2018-2020 by Lucas
|
||||
# CC0 1.0 Universal/Public domain - No rights reserved
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all
|
||||
|
|
@ -50,7 +50,7 @@ check_key()
|
|||
{
|
||||
case $1 in
|
||||
*/ | /* | ./* | */./* | */. | ../* | */../* | */..)
|
||||
err "Key can not end in a slash."
|
||||
err "$1: invalid key"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -70,9 +70,10 @@ sekrit_add()
|
|||
f=$SEKRIT_DIR/$key.gpg
|
||||
mkdir -p "${f%/*}"
|
||||
|
||||
[ -f "$f" ] && err "Key \"$key\" already exists."
|
||||
[ -f "$f" ] && err "key $key already exists"
|
||||
|
||||
if [ $# -gt 0 ]; then
|
||||
# use all additional parameters as a single string
|
||||
printf "%s\n" "$*"
|
||||
else
|
||||
cat -
|
||||
|
|
@ -88,13 +89,13 @@ sekrit_gen()
|
|||
while getopts l: flag; do
|
||||
case "$flag" in
|
||||
l) len=$(to_number "$OPTARG") ||
|
||||
err "Invalid password length."
|
||||
err "invalid password length"
|
||||
;;
|
||||
*) usage
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND - 1))
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
[ $# -le 1 ] || usage
|
||||
|
||||
|
|
@ -116,7 +117,7 @@ sekrit_get()
|
|||
shift
|
||||
|
||||
f=$SEKRIT_DIR/$key.gpg
|
||||
[ -f "$f" ] || err "No data for key \"$key\"."
|
||||
[ -f "$f" ] || err "no data for key $key"
|
||||
gpg2 -qd "$f"
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue