From a92bcfe91bc274970840cbd65e1389d0c4371e02 Mon Sep 17 00:00:00 2001
From: Timmy Keller <tjk@tjkeller.xyz>
Date: Thu, 11 Nov 2021 22:23:10 -0600
Subject: tssg changes and such

---
 keyboard/virt   | 28 ----------------------------
 launch/virt     | 30 ++++++++++++++++++++++++++++++
 sync/pushsite   |  3 +++
 video/ffconcat  | 17 +++++++++++++++++
 video/slideshow |  2 +-
 5 files changed, 51 insertions(+), 29 deletions(-)
 delete mode 100755 keyboard/virt
 create mode 100755 launch/virt
 create mode 100755 video/ffconcat

diff --git a/keyboard/virt b/keyboard/virt
deleted file mode 100755
index 2ab943e..0000000
--- a/keyboard/virt
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-virtdir=~/.local/share/virt
-
-halfram() { awk '/^MemTotal/ { printf "%dM\n", $2/2/1024 }' /proc/meminfo; } # Needs to be either in M or G according to man page
-halfthreads() { echo $(( $(nproc) / 2 )); }
-startvm() {
-	qemu-system-x86_64 \
-		-enable-kvm \
-		-cpu host \
-		-m $(halfram) \
-		-smp $(halfthreads) \
-		-vga virtio \
-		-display sdl,gl=on \
-		-audiodev pa,id=pa1,server=/run/user/1000/pulse/native \
-		-soundhw all \
-		-boot menu=on \
-		-drive file="$virtdir/$1.img" \
-; }
-
-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")
-
-if echo "$vms" | grep "^$vm.img$" >/dev/null; then
-	startvm "$vm"
-else
-	qemu-img create -f qcow2 "$virtdir/$vm.img" $(echo -n "4G\n8G\n16G\n32G" | dmenu -p "Choose Size of Virtual Machine \"$vm\"")
-fi
diff --git a/launch/virt b/launch/virt
new file mode 100755
index 0000000..f1035a0
--- /dev/null
+++ b/launch/virt
@@ -0,0 +1,30 @@
+#!/bin/sh
+virtdir=~/.local/share/virt
+
+halfram() { awk '/^MemTotal/ { printf "%dM\n", $2/2/1024 }' /proc/meminfo; } # Needs to be either in M or G according to man page
+halfthreads() { echo $(( $(nproc) / 2 )); }
+startvm() {
+	qemu-system-x86_64 \
+		-enable-kvm \
+		-cpu host \
+		-m $(halfram) \
+		-smp $(halfthreads) \
+		-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")
+
+if echo "$vms" | grep "^$vm.img$" >/dev/null; then
+	startvm "$vm"
+else
+	qemu-img create -f qcow2 "$virtdir/$vm.img" $(echo -n "4G\n8G\n16G\n32G" | dmenu -p "Choose Size of Virtual Machine \"$vm\"")
+fi
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 - \
-- 
cgit v1.2.3