split most functions out into scripts

20 files changed, 101 insertions, 120 deletions

diff --git a/bin/fm22avi b/bin/fm22avi
new file mode 100755
index 0000000..5d11d58
--- /dev/null
+++ b/bin/fm22avi
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+fceux --playmov $1.fm2 --sound 1 --soundq 1 --soundrate 48000 --nospritelim 1 --pal 0 --xscale 1 --yscale 1 --opengl 0 --special 0 $2 --videolog "mencoder - -o $1.avi -ovc x264 -x264encopts qp=0 -oac mp3lame -lameopts mode=3:preset=128 -noskip -nocache -mc 0 -aspect 4/3 NESVSETTINGS"
diff --git a/bin/hostcert b/bin/hostcert
new file mode 100755
index 0000000..561244c
--- /dev/null
+++ b/bin/hostcert
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+openssl s_client -connect "$1" < /dev/null 2>/dev/null | perl -nle 'print if /BEGIN CERTIFICATE/../END CERTIFICATE/' | openssl x509 -text | perl -nle 'print unless /BEGIN CERTIFICATE/../END CERTIFICATE/'
diff --git a/bin/mem_usage b/bin/mem_usage
new file mode 100755
index 0000000..038009e
--- /dev/null
+++ b/bin/mem_usage
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ps -eo rss,ucmd | sort -rn | head -n$([ -z "$1" ] && echo 20 || echo $1)
diff --git a/bin/pdfcat b/bin/pdfcat
new file mode 100755
index 0000000..663f0af
--- /dev/null
+++ b/bin/pdfcat
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+local out=$1
+shift
+gs -q -sPAPERSIZE=letter -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$out $*
diff --git a/bin/pick_music b/bin/pick_music
new file mode 100755
index 0000000..e667960
--- /dev/null
+++ b/bin/pick_music
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
+sqlite3 ${HOME}/.tracks.sqlite "SELECT artist FROM yearly_tracks WHERE artist NOT IN (SELECT DISTINCT(artist) FROM weekly_tracks) GROUP BY artist ORDER BY count(artist) * (strftime('%s') - max(timestamp)) DESC LIMIT $([ -z "$1" ] && echo 20 || echo $1)"
diff --git a/bin/pt b/bin/pt
new file mode 100755
index 0000000..5dda2aa
--- /dev/null
+++ b/bin/pt
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ -d blib ]]; then
+    prove -Mlib::require::all=blib/lib,blib/arch -Pretty -b "$@" t
+else
+    prove -Mlib::require::all=lib -Pretty -l "$@" t
+fi
diff --git a/bin/rand_music b/bin/rand_music
new file mode 100755
index 0000000..c726bf2
--- /dev/null
+++ b/bin/rand_music
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+local db
+if [[ $1 == '--old' ]]; then
+    db=old_tracks
+    shift
+else
+    db=yearly_tracks
+fi
+lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
+for i in $(seq 1 $([ -z "$1" ] && echo 20 || echo $1)); do
+    echo "select distinct(artist) from $db where artist not in (select distinct(artist) from weekly_tracks);" | sqlite3 ~/.tracks.sqlite | rand_line | sed "s/'/''/" | sed "s/.*/select artist, album from $db where artist = '&' group by artist, album;/" | sqlite3 ~/.tracks.sqlite | rand_line | sed 's/|/ - /'
+done
diff --git a/bin/setfont b/bin/setfont
new file mode 100755
index 0000000..50b4b78
--- /dev/null
+++ b/bin/setfont
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+printf '\e]710;%s\007\e]711;%s\007' "$1" "$1"
diff --git a/bin/svdn b/bin/svdn
new file mode 100755
index 0000000..ce6f4c4
--- /dev/null
+++ b/bin/svdn
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+svst "$1" && svstop "$1"
+svst "$1" && sleep 1
+svst "$1" && svstop "$1"
+for i in 1..5; do
+    svst "$1" && sleep 1
+done
+svst "$1" && svstop "$1"
+for i in 1..10; do
+    svst "$1" && sleep 1
+done
+svst "$1" && svkill "$1"
diff --git a/bin/svget b/bin/svget
new file mode 100755
index 0000000..d0cf384
--- /dev/null
+++ b/bin/svget
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+svstat "$HOME/.services/$1"
diff --git a/bin/svkill b/bin/svkill
new file mode 100755
index 0000000..c0ec724
--- /dev/null
+++ b/bin/svkill
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+svc -k "$HOME/.services/$1"
+svget "$1"
diff --git a/bin/svlog b/bin/svlog
new file mode 100755
index 0000000..436b25a
--- /dev/null
+++ b/bin/svlog
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+tail -F "$HOME/.log/$1/current" | tai64nlocal
diff --git a/bin/svre b/bin/svre
new file mode 100755
index 0000000..e57576e
--- /dev/null
+++ b/bin/svre
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+svdn "$1"
+svup "$1"
diff --git a/bin/svst b/bin/svst
new file mode 100755
index 0000000..92d20c1
--- /dev/null
+++ b/bin/svst
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+svget "$1" | grep -q ": up ("
diff --git a/bin/svstop b/bin/svstop
new file mode 100755
index 0000000..d861c6e
--- /dev/null
+++ b/bin/svstop
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+svc -d "$HOME/.services/$1"
+svget "$1"
diff --git a/bin/svup b/bin/svup
new file mode 100755
index 0000000..aea92f3
--- /dev/null
+++ b/bin/svup
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+svc -u "$HOME/.services/$1"
+svget "$1"
diff --git a/bin/t b/bin/t
new file mode 100755
index 0000000..b8555fc
--- /dev/null
+++ b/bin/t
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ -d blib ]]; then
+    perl -Mblib -MTest::Pretty "$@"
+else
+    perl -Ilib -MTest::Pretty "$@"
+fi
diff --git a/bin/web b/bin/web
new file mode 100755
index 0000000..a867a9a
--- /dev/null
+++ b/bin/web
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+local port=$1
+if [[ -z $port ]]; then
+    plackup -MPlack::App::Directory -e'Plack::App::Directory->new'
+else
+    plackup -MPlack::App::Directory -e'Plack::App::Directory->new' --port $port
+fi
diff --git a/bin/webcam b/bin/webcam
new file mode 100755
index 0000000..5bb47c1
--- /dev/null
+++ b/bin/webcam
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+local width=$1
+local height=$2
+if [[ -z $width ]];  then width=640;  fi
+if [[ -z $height ]]; then height=480; fi
+mplayer tv:// -tv driver=v4l2:width=${width}:height=${height}:device=/dev/video0 -fps 15 -vf screenshot
diff --git a/functions b/functions
index 78e07fd..5622940 100644
--- a/functions
+++ b/functions
@@ -1,11 +1,3 @@
-function web {
-    local port=$1
-    if [[ -z $port ]]; then
-        plackup -MPlack::App::Directory -e'Plack::App::Directory->new'
-    else
-        plackup -MPlack::App::Directory -e'Plack::App::Directory->new' --port $port
-    fi
-}
 function perldoc {
     # XXX bash specific
     if type cpandoc > /dev/null 2>&1; then
@@ -14,117 +6,5 @@ function perldoc {
         command perldoc "$@"
     fi
 }
-function webcam {
-    local width=$1
-    local height=$2
-    if [[ -z $width ]];  then width=640;  fi
-    if [[ -z $height ]]; then height=480; fi
-    mplayer tv:// -tv driver=v4l2:width=${width}:height=${height}:device=/dev/video0 -fps 15 -vf screenshot
-}
-function webcam_record {
-    local width=$1
-    if [[ -z $width ]];  then width=640;  else shift; fi
-    local height=$1
-    if [[ -z $height ]]; then height=480; else shift; fi
-    mencoder tv:// -tv driver=v4l2:width=${width}:height=${height}:device=/dev/video0:forceaudio:adevice=/dev/dsp -ovc lavc -oac mp3lame -lameopts cbr:br=64:mode=3 -o $1
-}
-function setfont {
-    printf '\e]710;%s\007\e]711;%s\007' "$1" "$1"
-}
-function mem_usage {
-    ps -eo rss,ucmd | sort -rn | head -n$([ -z "$1" ] && echo 20 || echo $1)
-}
-function opened_files {
-    strace $* 2>&1 | grep -E '^open\('   | \
-                     grep -v ENOENT      | \
-                     grep -v O_DIRECTORY | \
-                     cut -f2 -d"\"" | \
-                     grep -vE '^/proc/'  | \
-                     grep -v '^/sys/'    | \
-                     grep -v '^/dev/'
-}
-function alert {
-    echo "DISPLAY=$DISPLAY xmessage -center -default okay $1" | at $2
-}
-function fm22avi {
-    fceux --playmov $1.fm2 --sound 1 --soundq 1 --soundrate 48000 --nospritelim 1 --pal 0 --xscale 1 --yscale 1 --opengl 0 --special 0 $2 --videolog "mencoder - -o $1.avi -ovc x264 -x264encopts qp=0 -oac mp3lame -lameopts mode=3:preset=128 -noskip -nocache -mc 0 -aspect 4/3 NESVSETTINGS"
-}
-function pdfcat {
-    local out=$1
-    shift
-    gs -q -sPAPERSIZE=letter -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$out $*
-}
-function svup {
-    svc -u "$HOME/.services/$1"
-    svget "$1"
-}
-function svstop {
-    svc -d "$HOME/.services/$1"
-    svget "$1"
-}
-function svkill {
-    svc -k "$HOME/.services/$1"
-    svget "$1"
-}
-function svdn {
-    svst "$1" && svstop "$1"
-    svst "$1" && sleep 1
-    svst "$1" && svstop "$1"
-    for i in 1..5; do
-        svst "$1" && sleep 1
-    done
-    svst "$1" && svstop "$1"
-    for i in 1..10; do
-        svst "$1" && sleep 1
-    done
-    svst "$1" && svkill "$1"
-}
-function svget {
-    svstat "$HOME/.services/$1"
-}
-function svst {
-    svget "$1" | grep -q ": up ("
-}
-function svre {
-    svdn "$1"
-    svup "$1"
-}
-function svlog {
-    tail -F "$HOME/.log/$1/current" | tai64nlocal
-}
-function pick_music {
-    lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
-    sqlite3 ${HOME}/.tracks.sqlite "SELECT artist FROM yearly_tracks WHERE artist NOT IN (SELECT DISTINCT(artist) FROM weekly_tracks) GROUP BY artist ORDER BY count(artist) * (strftime('%s') - max(timestamp)) DESC LIMIT $([ -z "$1" ] && echo 20 || echo $1)"
-}
-function rand_music {
-    local db
-    if [[ $1 == '--old' ]]; then
-        db=old_tracks
-        shift
-    else
-        db=yearly_tracks
-    fi
-    lastfm_export --user doyster --dsn dbi:SQLite:${HOME}/.tracks.sqlite
-    for i in $(seq 1 $([ -z "$1" ] && echo 20 || echo $1)); do
-        echo "select distinct(artist) from $db where artist not in (select distinct(artist) from weekly_tracks);" | sqlite3 ~/.tracks.sqlite | rand_line | sed "s/'/''/" | sed "s/.*/select artist, album from $db where artist = '&' group by artist, album;/" | sqlite3 ~/.tracks.sqlite | rand_line | sed 's/|/ - /'
-    done
-}
-function t {
-    if [[ -d blib ]]; then
-        perl -Mblib -MTest::Pretty "$@"
-    else
-        perl -Ilib -MTest::Pretty "$@"
-    fi
-}
-function pt {
-    if [[ -d blib ]]; then
-        prove -Mlib::require::all=blib/lib,blib/arch -Pretty -b "$@" t
-    else
-        prove -Mlib::require::all=lib -Pretty -l "$@" t
-    fi
-}
-function hostcert {
-    openssl s_client -connect "$1" < /dev/null 2>/dev/null | perl -nle 'print if /BEGIN CERTIFICATE/../END CERTIFICATE/' | openssl x509 -text | perl -nle 'print unless /BEGIN CERTIFICATE/../END CERTIFICATE/'
-}
 
 # vim:ft=sh: