[java-idp-plugin-jetty] branch main updated: Replace readlink -e with readlink -f for portability.

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-idp-plugin-jetty.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-jetty/commit/d9aeceaf2ef82e20eedd657c01938c92b64f3873

The following commit(s) were added to refs/heads/main by this push:
     new d9aecea  Replace readlink -e with readlink -f for portability.
d9aecea is described below

commit d9aeceaf2ef82e20eedd657c01938c92b64f3873
Author: Steven Premeau <steven at premeauenterprises.com>
AuthorDate: Mon Dec 15 11:18:43 2025 -0500

    Replace readlink -e with readlink -f for portability.
---
 .../main/resources/net/shibboleth/idp/module/jetty/setjettybase.sh | 7 ++++++-
 .../resources/net/shibboleth/idp/module/jetty/setjettyversion.sh   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.sh
index edb511c..f4956cd 100755
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.sh
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.sh
@@ -55,7 +55,12 @@ if [ ! -d "${IDP_HOME}/jetty-base-${TARGET_BASE_VER}" ] ; then
   exit 1
 fi
 
-CURRENT_BASE_VER=$(readlink -e ${IDP_HOME}/jetty-base | sed -e 's/.*-//')
+CURRENT_BASE_VER="$(readlink -f ${IDP_HOME}/jetty-base)"
+if [ -d "${CURRENT_BASE_VER}" ] ; then
+  CURRENT_BASE_VER="$(echo ${CURRENT_BASE_VER} | sed -e 's/.*-//' )"
+else
+  CURRENT_BASE_VER=""
+fi
 
 if [ "${CURRENT_BASE_VER}" == "${TARGET_BASE_VER}" ] ; then
   echo "Jetty Base version ${CURRENT_BASE_VER} is already active."
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.sh
index 32d2728..2261ee0 100755
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.sh
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.sh
@@ -54,7 +54,12 @@ if [ ! -d "${IDP_HOME}/jetty-dist/jetty-home-${TARGET_JETTY_VER}" ] ; then
   exit 1
 fi
 
-CURRENT_JETTY_VER=$(readlink -e ${IDP_HOME}/jetty-home | sed -e 's/.*-//')
+CURRENT_JETTY_VER="$(readlink -f ${IDP_HOME}/jetty-home)"
+if [ -d "${CURRENT_JETTY_VER}" ] ; then
+  CURRENT_JETTY_VER="$(echo $CURRENT_JETTY_VER | sed -e 's/.*-//')"
+else
+  CURRENT_JETTY_VER=""
+fi
 
 if [ "${CURRENT_JETTY_VER}" == "${TARGET_JETTY_VER}" ] ; then
   echo "Jetty version ${CURRENT_JETTY_VER} is already active."

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.