From bacc4127b7da22c61671fe3ce0cef6db103884dd Mon Sep 17 00:00:00 2001 From: katherine Date: Sat, 1 Oct 2016 13:58:31 -0700 Subject: overhaul init system gen files now kept in gen directory. funcs now included in $PATH only if their funcreqs are successfully passed at login, making things cleaner and more system-independent --- .config/init/funcs/mpd-cover-convert | 2 +- .config/init/funcs/mpd-sleep | 12 ++++---- .config/init/funcs/scap | 26 +++++++++--------- .config/init/funcs/send | 53 ++++++++++++++++++------------------ 4 files changed, 47 insertions(+), 46 deletions(-) (limited to '.config/init/funcs') diff --git a/.config/init/funcs/mpd-cover-convert b/.config/init/funcs/mpd-cover-convert index cd3569a..e8359b7 100755 --- a/.config/init/funcs/mpd-cover-convert +++ b/.config/init/funcs/mpd-cover-convert @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/usr/bin/env zsh # make small cover versions for mpc-notify.sh # leaks memory for some reason, so don't run on a clean library # or it'll crash everything diff --git a/.config/init/funcs/mpd-sleep b/.config/init/funcs/mpd-sleep index c01d734..d821572 100755 --- a/.config/init/funcs/mpd-sleep +++ b/.config/init/funcs/mpd-sleep @@ -1,10 +1,10 @@ -#!/bin/zsh +#!/usr/bin/env zsh +# power off after mpd stops playing -# power off after finishing mpd playlist mpc play > /dev/null while true; do - mpc idle player > /dev/null || return 1 - if [[ -z "$(mpc status | grep playing)" ]]; then - poweroff - fi + mpc idle player > /dev/null || return 1 + if [[ -z "$(mpc status | grep playing)" ]]; then + poweroff + fi done diff --git a/.config/init/funcs/scap b/.config/init/funcs/scap index 489f7b8..bf9c66d 100755 --- a/.config/init/funcs/scap +++ b/.config/init/funcs/scap @@ -1,18 +1,18 @@ -#!/bin/zsh - +#!/usr/bin/env zsh # capture webm -scap() { - archey3 - sleep .2 - if [[ -f '/tmp/cap.mp4' ]]; then - rm '/tmp/cap.mp4' - fi +xset q +[[ $? -ne 0 ]] && return 1 + +archey3 +sleep .2 - echo 'recording...' +if [[ -f '/tmp/cap.mp4' ]]; then + rm '/tmp/cap.mp4' +fi - ffmpeg -v panic -video_size 1920x1080 -framerate 30 -f x11grab -i :0.0 \ - -f pulse -ac 2 -i default -af aresample=async=1 \ - -c:v libx264 -q 0 -preset fast '/tmp/cap.mp4' -} +echo 'recording...' +ffmpeg -v panic -video_size 1920x1080 -framerate 30 -f x11grab -i :0.0 \ + -f pulse -ac 2 -i default -af aresample=async=1 \ + -c:v libx264 -q 0 -preset ultrafast '/tmp/cap.mp4' diff --git a/.config/init/funcs/send b/.config/init/funcs/send index e88c8aa..009c601 100755 --- a/.config/init/funcs/send +++ b/.config/init/funcs/send @@ -1,46 +1,47 @@ -#!/bin/zsh +#!/usr/bin/env zsh # quickly send a file to hosted /tmp/ dir +# attempt to copy its location to the x clipboard local name local basename local escapes typeset -A escapes escapes=(' ' '%20' '"' '%22' '#' '%23' '$' '%24' - '%' '%25' '&' '%26' "'" '%27' '+' '%2b' - ',' '%2c' '/' '%2f' ':' '%3a' ';' '%3b' - '<' '%3c' '=' '%3d' '>' '%3e' '?' '%3f' - '@' '%40' '[' '%5b' '\' '%5c' ']' '%5d' - '^' '%5e' '`' '%60' '{' '%7b' '|' '%7c' - '}' '%7d' '~' '%7e') + '%' '%25' '&' '%26' "'" '%27' '+' '%2b' + ',' '%2c' '/' '%2f' ':' '%3a' ';' '%3b' + '<' '%3c' '=' '%3d' '>' '%3e' '?' '%3f' + '@' '%40' '[' '%5b' '\' '%5c' ']' '%5d' + '^' '%5e' '`' '%60' '{' '%7b' '|' '%7c' + '}' '%7d' '~' '%7e') [[ "$1" ]] \ - || { echo "please specify at least one file to send"; return 1 } + || { echo "please specify at least one file to send"; return 1 } for i in "$@"; do - [[ -f "$i" ]] \ - || { echo "file '$i' not found"; return 1 } + [[ -f "$i" ]] \ + || { echo "file '$i' not found"; return 1 } done scp "$@" shmibbles.me:http/tmp/ 2>/dev/null \ - || { echo "sending files failed"; return 1 } + || { echo "sending files failed"; return 1 } for name in "$@" do - basename=${name:t} + basename=${name:t} - ssh shmibbles.me "cd http/tmp; chmod o+r \"${basename//\"/\\\"}\"" \ - || { echo "making '$name' readable failed"; return 1 } + ssh shmibbles.me "cd http/tmp; chmod o+r \"${basename//\"/\\\"}\"" \ + || { echo "making '$name' readable failed"; return 1 } - { - printf "%s" 'https://shmibbles.me/tmp/' - for c in "${(s::)basename}"; do - if [[ "${escapes[$c]}" == "" ]]; then - printf "%s" "$c" - else - printf "%s" "${escapes[$c]}" - fi - done - } | tee \ - >(xclip -i -selection clipboard) \ - >(xclip -i -selection primary) >/dev/null + { + printf "%s" 'https://shmibbles.me/tmp/' + for c in "${(s::)basename}"; do + if [[ "${escapes[$c]}" == "" ]]; then + printf "%s" "$c" + else + printf "%s" "${escapes[$c]}" + fi + done + } | tee \ + >(xclip -i -selection clipboard) \ + >(xclip -i -selection primary) >/dev/null done -- cgit v1.2.3