Merge remote-tracking branch 'origin/master'

2 files changed, 22 insertions, 1 deletions

diff --git a/compile/nvim.sh b/compile/nvim.sh
index be7903c..d1533fb 100755
--- a/compile/nvim.sh
+++ b/compile/nvim.sh
@@ -31,9 +31,18 @@ if ! [ -d "$nvimdir" ] ; then
 	git clone https://github.com/neovim/neovim "$nvimdir"
 fi
 
+_extra_flags=''
+# Detectl musl libc and turn off LIBINTL
+for _f in /lib/ld-musl*so* ; do
+	if [ -e "$_f" ] ; then
+		_extra_flags="-DENABLE_LIBINTL=OFF"
+		break
+	fi
+done
+
 cd "$nvimdir"
 git clean -fdx .
 rm -rf build || echo ""
-make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$HOME/.local" -j"$nproc"
+make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$HOME/.local $_extra_flags" -j"$nproc"
 make install
 cd -
diff --git a/kshrc b/kshrc
index a51da08..1e92c7b 100644
--- a/kshrc
+++ b/kshrc
@@ -343,6 +343,7 @@ checkSSHAgentForward() {
 checkSSHAgent() {
 	if [ "$1" = "-k" ] ; then
 		pkill -9 ssh-agent
+		return
 	fi
 
 	# So OpenSSH 10.1 steps on my old configuration, rather than passing in -T
@@ -357,6 +358,17 @@ checkSSHAgent() {
 		#shellcheck disable=SC1090
 		. "$ssh_agent_conf"
 	fi
+
+	# We likely have busybox, assume we have to check /proc instead
+	if [ -L "$(command -v ps)" ] ; then
+		if ! [ -d /proc/"$SSH_AGENT_PID" ] ; then
+			ssh-agent -s | grep -v echo > "$ssh_agent_conf"
+		fi
+		#shellcheck disable=SC1090
+		. "$ssh_agent_conf"
+		return
+	fi
+
 	#shellcheck disable=SC2009
 	if ! ps aux | awk '{print $2}' | grep -q "$SSH_AGENT_PID" \
 		|| ! [ -e "$ssh_agent_conf" ] \