diff options
| -rw-r--r-- | ar/.config/git/ignore | 1 | ||||
| -rw-r--r-- | ar/.config/shell/aliasrc | 3 | ||||
| -rwxr-xr-x | ar/.local/bin/hugow | 28 | ||||
| -rwxr-xr-x | ar/.local/bin/mounter | 8 |
4 files changed, 39 insertions, 1 deletions
diff --git a/ar/.config/git/ignore b/ar/.config/git/ignore index 6b90686..6f2cd71 100644 --- a/ar/.config/git/ignore +++ b/ar/.config/git/ignore @@ -83,7 +83,6 @@ Thumbs.db # Private *personal* -/content/recordings/** # Shortcuts shortcutrc diff --git a/ar/.config/shell/aliasrc b/ar/.config/shell/aliasrc index 712c72c..5cd7580 100644 --- a/ar/.config/shell/aliasrc +++ b/ar/.config/shell/aliasrc @@ -494,6 +494,9 @@ alias ylogi='ylog -s hidden -c us | grep $(LC_TIME=C date -d "1 days ago" +%d/%b alias ylogp='ylog -s peertube | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' alias ylogP='ylog -s peertube | grep $(LC_TIME=C date -d "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' alias ylogt='ylog -s diary -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' +alias ylogT='ylog -s recordings -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' alias ylogy='ylog -s diary -c us | grep $(LC_TIME=C date -d "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' +alias ylogY='ylog -s recordings -c us | grep $(LC_TIME=C date -d "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' alias ylogr='ylog -s diary -c us | grep $(LC_TIME=C date -d "2 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' +alias ylogR='ylog -s recordings -c us | grep $(LC_TIME=C date -d "2 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "' alias ylogu='ylog -s diary -c us' diff --git a/ar/.local/bin/hugow b/ar/.local/bin/hugow index a715606..8860286 100755 --- a/ar/.local/bin/hugow +++ b/ar/.local/bin/hugow @@ -3,10 +3,13 @@ set -eu repodir="$HOME/Private/repos/THESIAH" out="$repodir/public/diary/index.html" +out2="$repodir/public/recordings/index.html" server="${THESIAH_SERVER:-root@thesiah.xyz}" dest="/var/www/thesiah/diary/" +dest2="/var/www/thesiah/recordings/" defaults="sy after foramonth" src="$repodir/public/diary/" +src2="$repodir/public/recordings/" bgm="$repodir/static/bgm/" bgmd="/var/www/thesiah/bgm/" @@ -18,7 +21,13 @@ if [ ! -f "$out" ]; then exit 1 fi +if [ ! -f "$out2" ]; then + echo "error: not found: $out2" >&2 + exit 1 +fi + ssh "$server" "mkdir -p '$dest'" +ssh "$server" "mkdir -p '$dest2'" rsync -azv --update --itemize-changes --stats "$bgm" "$server:$bgmd" @@ -31,6 +40,15 @@ else "$src" "$server:$dest" fi +if [ -n "${THESIAH_SSH_OPTS:-}" ]; then + rsync -azv --update --itemize-changes --stats \ + -e "ssh $THESIAH_SSH_OPTS" \ + "$src2" "$server:$dest2" +else + rsync -azv --update --itemize-changes --stats \ + "$src2" "$server:$dest2" +fi + if [ -n "${1-}" ]; then new="$repodir/content/diary/$1" if [ -f "$new" ]; then @@ -40,6 +58,16 @@ if [ -n "${1-}" ]; then fi fi +if [ -n "${1-}" ]; then + new="$repodir/content/recordings/$1" + if [ -f "$new" ]; then + rsync -az --update "$new" "$server:$dest2" + elif [ -d "$new" ]; then + rsync -az --update "$new/" "$server:$dest2$(basename "$new")/" + fi +fi + ssh "$THESIAH_SERVER" "chmod 644 $dest/index.html" +ssh "$THESIAH_SERVER" "chmod 644 $dest2/index.html" cd - >/dev/null diff --git a/ar/.local/bin/mounter b/ar/.local/bin/mounter index c8eabbf..e62f61b 100755 --- a/ar/.local/bin/mounter +++ b/ar/.local/bin/mounter @@ -83,6 +83,13 @@ done | filter)" # Get all normal, non-encrypted or decrypted partitions that are not mounted. normalparts="$(echo "$lsblkoutput" | grep -v crypto_LUKS | grep -v 'LVM2_member' | grep -v 'part 1M' | grep 'part\|rom\|crypt' | sed "s/^/💾 /" | filter)" +# Get unpartitioned raw disks (disks with no partition children that are not mounted). +rawdisks="$(echo "$lsblkoutput" | awk ' + $3=="disk" {disks[$2]=$0} + $3=="part" {dev=$2; gsub(/p?[0-9]+$/, "", dev); haspart[dev]=1} + END {for (d in disks) if (!(d in haspart)) print disks[d]} +' | sed "s/^/💾 /" | filter)" + # Get all available IP addresses with open Samba shares in the wlan0 subnet, excluding eth0 IP smbips="$(sudo arp-scan --interface=eth0 --interface=wlan0 --localnet | grep -vEi '(EFM Networks|DUP:)' | awk '/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/{print $1}')" @@ -140,6 +147,7 @@ alldrives="$(echo "$phones $iphones $unopenedluks $normalparts +$rawdisks $smbs" | sed "/^$/d;s/ *$//")" # Quit the script if a sequential command fails. |