Skip to content

Commit a62b7e4

Browse files
chrisbbreuerchrisbbreuer
committed
chore: wip
1 parent 71b9e82 commit a62b7e4

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed

‎.github/workflows/build-binaries.yml

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,15 @@ jobs:
267267
# Find the launchpad iconv installation
268268
LAUNCHPAD_ICONV_DIR="$HOME/.local/share/launchpad/global/gnu.org/libiconv"
269269
if [[ -d "$LAUNCHPAD_ICONV_DIR" ]]; then
270-
# Find the latest version
271-
ICONV_VERSION=$(ls "$LAUNCHPAD_ICONV_DIR" | grep "^v" | sort -V | tail -1)
272-
if [[ -n "$ICONV_VERSION" ]]; then
270+
# Find the latest version - use find to avoid shell expansion issues
271+
ICONV_VERSION=$(find "$LAUNCHPAD_ICONV_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
272+
if [[ -n "$ICONV_VERSION" && "$ICONV_VERSION" != "v*" ]]; then
273273
ICONV_PATH="$LAUNCHPAD_ICONV_DIR/$ICONV_VERSION"
274274
echo "Found launchpad iconv at: $ICONV_PATH"
275275
EXTRA_CONFIG="--with-iconv=$ICONV_PATH"
276276
else
277-
echo "No iconv version found in $LAUNCHPAD_ICONV_DIR"
277+
echo "No valid iconv version found in $LAUNCHPAD_ICONV_DIR"
278+
echo "Available versions: $(ls -la "$LAUNCHPAD_ICONV_DIR" 2>/dev/null || echo 'none')"
278279
EXTRA_CONFIG="--with-iconv"
279280
fi
280281
else
@@ -285,14 +286,15 @@ jobs:
285286
# Find the launchpad readline installation
286287
LAUNCHPAD_READLINE_DIR="$HOME/.local/share/launchpad/global/gnu.org/readline"
287288
if [[ -d "$LAUNCHPAD_READLINE_DIR" ]]; then
288-
# Find the latest version
289-
READLINE_VERSION=$(ls "$LAUNCHPAD_READLINE_DIR" | grep "^v" | sort -V | tail -1)
290-
if [[ -n "$READLINE_VERSION" ]]; then
289+
# Find the latest version - use find to avoid shell expansion issues
290+
READLINE_VERSION=$(find "$LAUNCHPAD_READLINE_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
291+
if [[ -n "$READLINE_VERSION" && "$READLINE_VERSION" != "v*" ]]; then
291292
READLINE_PATH="$LAUNCHPAD_READLINE_DIR/$READLINE_VERSION"
292293
echo "Found launchpad readline at: $READLINE_PATH"
293294
EXTRA_CONFIG="$EXTRA_CONFIG --with-readline=$READLINE_PATH"
294295
else
295-
echo "No readline version found in $LAUNCHPAD_READLINE_DIR"
296+
echo "No valid readline version found in $LAUNCHPAD_READLINE_DIR"
297+
echo "Available versions: $(ls -la "$LAUNCHPAD_READLINE_DIR" 2>/dev/null || echo 'none')"
296298
fi
297299
else
298300
echo "Launchpad readline not found, using system readline"
@@ -301,9 +303,9 @@ jobs:
301303
# Find the launchpad bzip2 installation
302304
LAUNCHPAD_BZIP2_DIR="$HOME/.local/share/launchpad/global/sourceware.org/bzip2"
303305
if [[ -d "$LAUNCHPAD_BZIP2_DIR" ]]; then
304-
# Find the latest version
305-
BZIP2_VERSION=$(ls "$LAUNCHPAD_BZIP2_DIR" | grep "^v" | sort -V | tail -1)
306-
if [[ -n "$BZIP2_VERSION" ]]; then
306+
# Find the latest version - use find to avoid shell expansion issues
307+
BZIP2_VERSION=$(find "$LAUNCHPAD_BZIP2_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
308+
if [[ -n "$BZIP2_VERSION" && "$BZIP2_VERSION" != "v*" ]]; then
307309
BZIP2_PATH="$LAUNCHPAD_BZIP2_DIR/$BZIP2_VERSION"
308310
echo "Found launchpad bzip2 at: $BZIP2_PATH"
309311
@@ -355,9 +357,9 @@ jobs:
355357
# Check libzip compatibility and handle zip extension
356358
LAUNCHPAD_LIBZIP_DIR="$HOME/.local/share/launchpad/global/libzip.org"
357359
if [[ -d "$LAUNCHPAD_LIBZIP_DIR" ]]; then
358-
# Find the latest version
359-
LIBZIP_VERSION=$(ls "$LAUNCHPAD_LIBZIP_DIR" | grep "^v" | sort -V | tail -1)
360-
if [[ -n "$LIBZIP_VERSION" ]]; then
360+
# Find the latest version - use find to avoid shell expansion issues
361+
LIBZIP_VERSION=$(find "$LAUNCHPAD_LIBZIP_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
362+
if [[ -n "$LIBZIP_VERSION" && "$LIBZIP_VERSION" != "v*" ]]; then
361363
LIBZIP_PATH="$LAUNCHPAD_LIBZIP_DIR/$LIBZIP_VERSION"
362364
echo "Found launchpad libzip at: $LIBZIP_PATH"
363365
@@ -423,8 +425,8 @@ jobs:
423425
# Find launchpad-installed GMP for bcmath extension
424426
LAUNCHPAD_GMP_DIR="$HOME/.local/share/launchpad/global/gnu.org/gmp"
425427
if [[ -d "$LAUNCHPAD_GMP_DIR" ]]; then
426-
GMP_VERSION=$(ls "$LAUNCHPAD_GMP_DIR" | grep "^v" | sort -V | tail -1)
427-
if [[ -n "$GMP_VERSION" ]]; then
428+
GMP_VERSION=$(find "$LAUNCHPAD_GMP_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
429+
if [[ -n "$GMP_VERSION" && "$GMP_VERSION" != "v*" ]]; then
428430
GMP_PATH="$LAUNCHPAD_GMP_DIR/$GMP_VERSION"
429431
echo "Found launchpad GMP at: $GMP_PATH"
430432
EXTRA_CONFIG="$EXTRA_CONFIG --with-gmp=$GMP_PATH"
@@ -434,8 +436,8 @@ jobs:
434436
# Find launchpad-installed libsodium for sodium extension
435437
LAUNCHPAD_SODIUM_DIR="$HOME/.local/share/launchpad/global/libsodium.org"
436438
if [[ -d "$LAUNCHPAD_SODIUM_DIR" ]]; then
437-
SODIUM_VERSION=$(ls "$LAUNCHPAD_SODIUM_DIR" | grep "^v" | sort -V | tail -1)
438-
if [[ -n "$SODIUM_VERSION" ]]; then
439+
SODIUM_VERSION=$(find "$LAUNCHPAD_SODIUM_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
440+
if [[ -n "$SODIUM_VERSION" && "$SODIUM_VERSION" != "v*" ]]; then
439441
SODIUM_PATH="$LAUNCHPAD_SODIUM_DIR/$SODIUM_VERSION"
440442
echo "Found launchpad libsodium at: $SODIUM_PATH"
441443
EXTRA_CONFIG="$EXTRA_CONFIG --with-sodium=$SODIUM_PATH"
@@ -445,8 +447,8 @@ jobs:
445447
# Find launchpad-installed oniguruma for mbstring extension
446448
LAUNCHPAD_ONIGURUMA_DIR="$HOME/.local/share/launchpad/global/github.com/kkos/oniguruma"
447449
if [[ -d "$LAUNCHPAD_ONIGURUMA_DIR" ]]; then
448-
ONIGURUMA_VERSION=$(ls "$LAUNCHPAD_ONIGURUMA_DIR" | grep "^v" | sort -V | tail -1)
449-
if [[ -n "$ONIGURUMA_VERSION" ]]; then
450+
ONIGURUMA_VERSION=$(find "$LAUNCHPAD_ONIGURUMA_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
451+
if [[ -n "$ONIGURUMA_VERSION" && "$ONIGURUMA_VERSION" != "v*" ]]; then
450452
ONIGURUMA_PATH="$LAUNCHPAD_ONIGURUMA_DIR/$ONIGURUMA_VERSION"
451453
echo "Found launchpad oniguruma at: $ONIGURUMA_PATH"
452454
EXTRA_CONFIG="$EXTRA_CONFIG --with-onig=$ONIGURUMA_PATH"
@@ -456,8 +458,8 @@ jobs:
456458
# Find launchpad-installed libxml2 for XML extension
457459
LAUNCHPAD_LIBXML2_DIR="$HOME/.local/share/launchpad/global/gnome.org/libxml2"
458460
if [[ -d "$LAUNCHPAD_LIBXML2_DIR" ]]; then
459-
LIBXML2_VERSION=$(ls "$LAUNCHPAD_LIBXML2_DIR" | grep "^v" | sort -V | tail -1)
460-
if [[ -n "$LIBXML2_VERSION" ]]; then
461+
LIBXML2_VERSION=$(find "$LAUNCHPAD_LIBXML2_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
462+
if [[ -n "$LIBXML2_VERSION" && "$LIBXML2_VERSION" != "v*" ]]; then
461463
LIBXML2_PATH="$LAUNCHPAD_LIBXML2_DIR/$LIBXML2_VERSION"
462464
echo "Found launchpad libxml2 at: $LIBXML2_PATH"
463465
EXTRA_CONFIG="$EXTRA_CONFIG --with-libxml-dir=$LIBXML2_PATH"
@@ -467,8 +469,8 @@ jobs:
467469
# Find launchpad-installed libxslt for XSLT extension
468470
LAUNCHPAD_LIBXSLT_DIR="$HOME/.local/share/launchpad/global/gnome.org/libxslt"
469471
if [[ -d "$LAUNCHPAD_LIBXSLT_DIR" ]]; then
470-
LIBXSLT_VERSION=$(ls "$LAUNCHPAD_LIBXSLT_DIR" | grep "^v" | sort -V | tail -1)
471-
if [[ -n "$LIBXSLT_VERSION" ]]; then
472+
LIBXSLT_VERSION=$(find "$LAUNCHPAD_LIBXSLT_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
473+
if [[ -n "$LIBXSLT_VERSION" && "$LIBXSLT_VERSION" != "v*" ]]; then
472474
LIBXSLT_PATH="$LAUNCHPAD_LIBXSLT_DIR/$LIBXSLT_VERSION"
473475
echo "Found launchpad libxslt at: $LIBXSLT_PATH"
474476
EXTRA_CONFIG="$EXTRA_CONFIG --with-xsl=$LIBXSLT_PATH"
@@ -478,8 +480,8 @@ jobs:
478480
# Find launchpad-installed openldap for LDAP extension
479481
LAUNCHPAD_OPENLDAP_DIR="$HOME/.local/share/launchpad/global/openldap.org"
480482
if [[ -d "$LAUNCHPAD_OPENLDAP_DIR" ]]; then
481-
OPENLDAP_VERSION=$(ls "$LAUNCHPAD_OPENLDAP_DIR" | grep "^v" | sort -V | tail -1)
482-
if [[ -n "$OPENLDAP_VERSION" ]]; then
483+
OPENLDAP_VERSION=$(find "$LAUNCHPAD_OPENLDAP_DIR" -maxdepth 1 -type d -name "v*" | sed 's|.*/||' | sort -V | tail -1)
484+
if [[ -n "$OPENLDAP_VERSION" && "$OPENLDAP_VERSION" != "v*" ]]; then
483485
OPENLDAP_PATH="$LAUNCHPAD_OPENLDAP_DIR/$OPENLDAP_VERSION"
484486
echo "Found launchpad openldap at: $OPENLDAP_PATH"
485487
EXTRA_CONFIG="$EXTRA_CONFIG --with-ldap=$OPENLDAP_PATH"

0 commit comments

Comments
 (0)