kousu · June 6, 2025 16:15
diff --git a/README.md b/README.md
diff --git a/android_ssh_askpass b/android_ssh_askpass
 #!/data/data/com.termux/files/usr/bin/sh

 # XXX SSH_KEYFILE is a non-standard feature. It's hacked in.
 if [ -n "${SSH_KEYFILE}" ]; then
 	PROMPT="Passphrase for ${SSH_KEYFILE}"
 else
 	PROMPT="Passphrase"
 fi

 termux-dialog text -p -t "Unlock SSH Key" -i "${PROMPT}" | jq -r '.text'
diff --git a/sync-notes b/sync-notes
 #!/data/data/com.termux/files/usr/bin/bash

 ORIG_0=$0

 sv enable ssh-agent  # ssh-agent is killed by Android a lot. make sure it's up.
 sv start ssh-agent   # ((termux's [recommended](https://wiki.termux.com/wiki/Remote_Access#SSH_Agent) solution
                     # is to use their `ssha` wrapper, but it's not fully transparent: it runs ssh-agent
                     # outside of sv, and it auto-adds all identities, so it gets messy when called by git)
                     # `sv start ssh-agent` + setting SSH_AUTH_SOCK is effectively all it does.
 export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR:-"${TERMUX__PREFIX:-"${PREFIX}"}/var/run"}"/ssh-agent.socket

 export SSH_KEYFILE=$(ls -1 ~/.ssh/id_* | head -n 1)  # hack; assumes only one ssh key exists.
 export SSH_ASKPASS=~/.local/bin/android_ssh_askpass  # TODO: move this to /etc/profile.d?
 export SSH_ASKPASS_REQUIRE=force

 export GIT_SSH_COMMAND="ssh -o AddKeysToAgent=yes"

 gitsync() {
  set -e

  # The git commands are all `set -x` so that their output
  # comes with a header explaining what it is in the log
  # (but the logic around them is hidden)
  #
  (set -x; git stage --all .) # NB: --all means stage deletions too, not just new and modified files
  if ! git diff --staged --quiet; then
    #
    (set -x; git commit -m "Syncing")
  fi
  # Instead of pull --rebase, do separate fetch + rebase,
  # so that we can distinguish error cases:
  # network/auth problems will fail at fetch
  # and merge conflicts will fail at rebase
  (set -x; git fetch)
  # https://stackoverflow.com/questions/44953117/can-git-tell-me-if-a-rebase-will-conflict-without-actually-rebasing :
  # TODO: read git config pull.rebase to decide between using rebase or merge
  (set -x; git rebase) || (ORIG_RC=$?; (set -x; git rebase --abort) && exit $ORIG_RC);
  (set -x; git push)
 }

 # Run a commmand; on **error**, output to logcat and android notifications
 chrony() {
  LOG=$(mktemp)
  trap 'rm $LOG' EXIT
  "$@" 2>&1  | tee $LOG
  # Unlike the real chrony, this always outputs to stderr;
  # this is good -for me- because I want to see what happens when
  # I tap "sync", means this function is misleadingly named.
  #
  # is it possible to send stdout and stderr to the same log file
  # while also both sending them to /dev/stdout and /dev/stderr?
  RC="${PIPESTATUS[0]}"
  if [ "$RC" -ne 0 ]; then
    (cat $LOG; echo "Sync $(basename $(pwd)) Failed") | logger -t sync_notes
    if ! tty -s; then
      # if in batch mode, give feedback via notification
      # (need to use tail because the notif gets cropped; unclear what the limit is
      # and whether it's in lines, bytes, characters, it seems to bounce around)
      tail -n 10 $LOG | termux-notification --id sync_notes --icon dangerous --title "Sync $(basename $(pwd)) Failed" --button1 Retry --button1-action "$ORIG_0"
    fi
  #else
  #  echo "Sync $(basename $(pwd)) Succeeded" | tee /dev/stderr | logger -t sync_notes
  fi
  exit $RC
 }

 cd ~/storage/shared/Diary/
 chrony gitsync
	#!/data/data/com.termux/files/usr/bin/sh

	# XXX SSH_KEYFILE is a non-standard feature. It's hacked in.
	if [ -n "${SSH_KEYFILE}" ]; then
	PROMPT="Passphrase for ${SSH_KEYFILE}"
	else
	PROMPT="Passphrase"
	fi

	termux-dialog text -p -t "Unlock SSH Key" -i "${PROMPT}" \| jq -r '.text'
	#!/data/data/com.termux/files/usr/bin/bash

	ORIG_0=$0

	sv enable ssh-agent # ssh-agent is killed by Android a lot. make sure it's up.
	sv start ssh-agent # ((termux's [recommended](https://wiki.termux.com/wiki/Remote_Access#SSH_Agent) solution
	# is to use their `ssha` wrapper, but it's not fully transparent: it runs ssh-agent
	# outside of sv, and it auto-adds all identities, so it gets messy when called by git)
	# `sv start ssh-agent` + setting SSH_AUTH_SOCK is effectively all it does.
	export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR:-"${TERMUX__PREFIX:-"${PREFIX}"}/var/run"}"/ssh-agent.socket

	export SSH_KEYFILE=$(ls -1 ~/.ssh/id_* \| head -n 1) # hack; assumes only one ssh key exists.
	export SSH_ASKPASS=~/.local/bin/android_ssh_askpass # TODO: move this to /etc/profile.d?
	export SSH_ASKPASS_REQUIRE=force

	export GIT_SSH_COMMAND="ssh -o AddKeysToAgent=yes"

	gitsync() {
	set -e

	# The git commands are all `set -x` so that their output
	# comes with a header explaining what it is in the log
	# (but the logic around them is hidden)
	#
	(set -x; git stage --all .) # NB: --all means stage deletions too, not just new and modified files
	if ! git diff --staged --quiet; then
	#
	(set -x; git commit -m "Syncing")
	fi
	# Instead of pull --rebase, do separate fetch + rebase,
	# so that we can distinguish error cases:
	# network/auth problems will fail at fetch
	# and merge conflicts will fail at rebase
	(set -x; git fetch)
	# https://stackoverflow.com/questions/44953117/can-git-tell-me-if-a-rebase-will-conflict-without-actually-rebasing :
	# TODO: read git config pull.rebase to decide between using rebase or merge
	(set -x; git rebase) \|\| (ORIG_RC=$?; (set -x; git rebase --abort) && exit $ORIG_RC);
	(set -x; git push)
	}

	# Run a commmand; on error, output to logcat and android notifications
	chrony() {
	LOG=$(mktemp)
	trap 'rm $LOG' EXIT
	"$@" 2>&1 \| tee $LOG
	# Unlike the real chrony, this always outputs to stderr;
	# this is good -for me- because I want to see what happens when
	# I tap "sync", means this function is misleadingly named.
	#
	# is it possible to send stdout and stderr to the same log file
	# while also both sending them to /dev/stdout and /dev/stderr?
	RC="${PIPESTATUS[0]}"
	if [ "$RC" -ne 0 ]; then
	(cat $LOG; echo "Sync $(basename $(pwd)) Failed") \| logger -t sync_notes
	if ! tty -s; then
	# if in batch mode, give feedback via notification
	# (need to use tail because the notif gets cropped; unclear what the limit is
	# and whether it's in lines, bytes, characters, it seems to bounce around)
	tail -n 10 $LOG \| termux-notification --id sync_notes --icon dangerous --title "Sync $(basename $(pwd)) Failed" --button1 Retry --button1-action "$ORIG_0"
	fi
	#else
	# echo "Sync $(basename $(pwd)) Succeeded" \| tee /dev/stderr \| logger -t sync_notes
	fi
	exit $RC
	}

	cd ~/storage/shared/Diary/
	chrony gitsync