From 99c22147d64b9a7e563faf553b4d096032903a6c Mon Sep 17 00:00:00 2001 From: Manevolent Date: Fri, 23 Feb 2024 16:53:07 -0700 Subject: [PATCH] Update build.sh --- build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 7a88841..0d560a6 100755 --- a/build.sh +++ b/build.sh @@ -48,13 +48,17 @@ do # Clone and copy the repository rm -rfv "$(basename "$git" .git)" - GIT_SSH_COMMAND="ssh -i /etc/lixonet/${netname}/id_rsa -o IdentitiesOnly=yes" git clone $git || { echo "clone $git failed, quitting" ; exit 1; } + rsa_filename=`/etc/lixonet/${netname}/$(basename "$git" .git).key` + if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/${netname}/id_rsa"; fi + GIT_SSH_COMMAND="ssh -i $rsa_filename -o IdentitiesOnly=yes" git clone $git || { echo "clone $git failed, quitting" ; exit 1; } # Clone any add-ons for addon_git in `echo "$addons" | tr "," "\n"` do - rm -rfv "$(basename "$addon_git" .git)" - GIT_SSH_COMMAND="ssh -i /etc/lixonet/${netname}/id_rsa -o IdentitiesOnly=yes" git clone $addon_git || { echo "clone addon $addon_git failed, quitting" ; exit 1; } + rm -rfv "$(basename "$addon_git" .git)" + rsa_filename=`/etc/lixonet/${netname}/$(basename "$addon_git" .git).key` + if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/${netname}/id_rsa"; fi + GIT_SSH_COMMAND="ssh -i $rsa_filename -o IdentitiesOnly=yes" git clone $addon_git || { echo "clone addon $addon_git failed, quitting" ; exit 1; } done echo "Creating work directory..."