From 330bb34d2c4171e7b1cea3d32347d9a00c88a882 Mon Sep 17 00:00:00 2001 From: Sibin Grasic Date: Tue, 9 Jul 2024 16:59:14 +0200 Subject: [PATCH] fix: Architecture detect implementation Fixes #53 --- install.yaml | 8 ++++---- .../ioncube/{download-loaders => download-loaders.sh} | 5 +++-- .../ioncube/{modify-dockerfile => modify-dockerfile.sh} | 0 3 files changed, 7 insertions(+), 6 deletions(-) rename web-build/ioncube/{download-loaders => download-loaders.sh} (92%) rename web-build/ioncube/{modify-dockerfile => modify-dockerfile.sh} (100%) diff --git a/install.yaml b/install.yaml index 9ad08d8..390afa7 100644 --- a/install.yaml +++ b/install.yaml @@ -1,14 +1,14 @@ name: ddev-ioncube project_files: - - web-build/ioncube/download-loaders - - web-build/ioncube/modify-dockerfile + - web-build/ioncube/download-loaders.sh + - web-build/ioncube/modify-dockerfile.sh post_install_actions: - | #ddev-description: Download IonCube Loaders # - ./web-build/ioncube/download-loaders + ./web-build/ioncube/download-loaders.sh - | #ddev-description: Modify Dockerfile - ./web-build/ioncube/modify-dockerfile + ./web-build/ioncube/modify-dockerfile.sh diff --git a/web-build/ioncube/download-loaders b/web-build/ioncube/download-loaders.sh similarity index 92% rename from web-build/ioncube/download-loaders rename to web-build/ioncube/download-loaders.sh index 89739ce..07dca69 100755 --- a/web-build/ioncube/download-loaders +++ b/web-build/ioncube/download-loaders.sh @@ -1,9 +1,10 @@ #!/bin/bash #ddev-generated set -e -ARCH=$(/usr/bin/arch) -if [ "$ARCH" = "arm64" ]; then +ARCH="$(/usr/bin/arch)" + +if [ "$ARCH" = "aarch64" ]; then ARCH="aarch64" elif [ "$ARCH" = "x86_64" ]; then ARCH="x86-64" diff --git a/web-build/ioncube/modify-dockerfile b/web-build/ioncube/modify-dockerfile.sh similarity index 100% rename from web-build/ioncube/modify-dockerfile rename to web-build/ioncube/modify-dockerfile.sh