From c1c68718c6ce80d387e90ab90ebf9889961c8942 Mon Sep 17 00:00:00 2001
From: Simon Shirley <email@simonshirley.uk>
Date: Thu, 16 Jan 2025 13:39:23 +0000
Subject: [PATCH 1/3] Add xdg-utils to install script with apt-get and apk

---
 src/shopify-cli/install.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/shopify-cli/install.sh b/src/shopify-cli/install.sh
index 479416719..7a83979d4 100755
--- a/src/shopify-cli/install.sh
+++ b/src/shopify-cli/install.sh
@@ -10,6 +10,20 @@ set -e
 # of the script
 ensure_nanolayer nanolayer_location "v0.5.5"
 
+if [ -x "/usr/bin/apt-get" ] ; then
+    $nanolayer_location \
+        install \
+        apt-get \
+        "xdg-utils"
+elif [ -x "/sbin/apk" ] ; then
+    $nanolayer_location \
+        install \
+        apk \
+        "xdg-utils"
+else
+    echo "Distro not supported"
+    exit 1
+fi
 
 $nanolayer_location \
     install \

From 9628f8876504f8c25b86e1f54d1674e5187957d0 Mon Sep 17 00:00:00 2001
From: Simon Shirley <email@simonshirley.uk>
Date: Thu, 16 Jan 2025 17:12:50 +0000
Subject: [PATCH 2/3] Update version to 1.0.3

---
 src/shopify-cli/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shopify-cli/devcontainer-feature.json b/src/shopify-cli/devcontainer-feature.json
index 39a2fc467..42d567e36 100644
--- a/src/shopify-cli/devcontainer-feature.json
+++ b/src/shopify-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "shopify-cli",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "name": "Shopify CLI (via npm)",
     "documentationURL": "http://github.com/devcontainers-extra/features/tree/main/src/shopify-cli",
     "description": "Shopify CLI is a command-line interface tool that helps you build Shopify apps and themes. It quickly generates Shopify apps, themes, and custom storefronts. You can also use it to automate many common development tasks.",

From f13e96ecfd5e543c934b3e7b1fd6ad40b30d32be Mon Sep 17 00:00:00 2001
From: Simon Shirley <email@simonshirley.uk>
Date: Thu, 16 Jan 2025 18:16:55 +0000
Subject: [PATCH 3/3] Remove apk check from install script

Currently, the npm-package feature doesn't support Alpine, so this check has been removed for now.
---
 src/shopify-cli/install.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/shopify-cli/install.sh b/src/shopify-cli/install.sh
index 7a83979d4..5c7bbf766 100755
--- a/src/shopify-cli/install.sh
+++ b/src/shopify-cli/install.sh
@@ -15,11 +15,6 @@ if [ -x "/usr/bin/apt-get" ] ; then
         install \
         apt-get \
         "xdg-utils"
-elif [ -x "/sbin/apk" ] ; then
-    $nanolayer_location \
-        install \
-        apk \
-        "xdg-utils"
 else
     echo "Distro not supported"
     exit 1