diff options
| author | Timmy Keller <tjk@tjkeller.xyz> | 2021-11-11 22:23:10 -0600 |
|---|---|---|
| committer | Timmy Keller <tjk@tjkeller.xyz> | 2021-11-11 22:23:10 -0600 |
| commit | a92bcfe91bc274970840cbd65e1389d0c4371e02 (patch) | |
| tree | b0d507fc9bee430cb429d32e796201773c8599d3 | |
| parent | 73688982c135a0276a64aec7d61aaff4e9434d09 (diff) | |
| download | scripts-a92bcfe91bc274970840cbd65e1389d0c4371e02.tar.xz scripts-a92bcfe91bc274970840cbd65e1389d0c4371e02.zip | |
tssg changes and such
| -rwxr-xr-x | launch/virt (renamed from keyboard/virt) | 6 | ||||
| -rwxr-xr-x | sync/pushsite | 3 | ||||
| -rwxr-xr-x | video/ffconcat | 17 | ||||
| -rwxr-xr-x | video/slideshow | 2 |
4 files changed, 25 insertions, 3 deletions
diff --git a/keyboard/virt b/launch/virt index 2ab943e..f1035a0 100755 --- a/keyboard/virt +++ b/launch/virt @@ -9,14 +9,16 @@ startvm() { -cpu host \ -m $(halfram) \ -smp $(halfthreads) \ - -vga virtio \ - -display sdl,gl=on \ + -net nic \ + -nographic \ + -vga none \ -audiodev pa,id=pa1,server=/run/user/1000/pulse/native \ -soundhw all \ -boot menu=on \ -drive file="$virtdir/$1.img" \ ; } + #-display sdl,gl=on \ vms="$(ls $virtdir)" [ -n "$1" ] && vm="$1" || vm=$(echo "$vms" | sed 's/\.img//' | dmenu -p "Choose Virtual Machine Image or Enter Name for New Virtual Machine") diff --git a/sync/pushsite b/sync/pushsite index 4507256..1a1cbc3 100755 --- a/sync/pushsite +++ b/sync/pushsite @@ -2,4 +2,7 @@ ssh root@tjkeller.xyz << EOF cd /var/www/tjkeller/ git pull +cd articles +git pull +./tssg -r tssgmd . template.html EOF diff --git a/video/ffconcat b/video/ffconcat new file mode 100755 index 0000000..7e903f6 --- /dev/null +++ b/video/ffconcat @@ -0,0 +1,17 @@ +#!/bin/sh +#for out; do true; done # get last argument +filelist=$(mktemp ${TMPDIR:-/tmp}/ffconcat.XXXXXX) || exit +pwd="$(pwd)" +for out; do + [ -e "$pwd/$out" ] \ + && files="$pwd/$out\n$files" \ + || ([ -e "$out" ] && files="$out\n$files") +done +echo $files | tail +2 | sed -n "s/\(.\+\)/file '\1'/p"# > $filelist + +ffmpeg \ + -f concat \ + -safe 0 \ + -i $filelist \ + -c copy \ + $out diff --git a/video/slideshow b/video/slideshow index 94c530e..d1a9647 100755 --- a/video/slideshow +++ b/video/slideshow @@ -1,5 +1,5 @@ #!/bin/sh -cat *.JPG | ffmpeg -y \ +cat "$@" | ffmpeg -y \ -framerate 0.20 -loop 1 \ -f image2pipe \ -i - \ |