Merge pull request #3 from linuxserver-labs/case

Author: thespad

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         fi
 
         echo "**** Retrieving external version ****"
-        EXT_RELEASE=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ | egrep -m 1 -o 'https?://[^ ]+.tar.gz' | awk -F "/" '{print $NF}' | awk -F '_' '{print $4}')
+        EXT_RELEASE=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ | egrep -m 1 -io 'https?://[^ ]+.tar.gz' | awk -F "/" '{print $NF}' | awk -F '_' '{print $4}')
         if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
           echo "**** Can't retrieve external version, exiting ****"
           exit 1
@@ -84,7 +84,7 @@ jobs:
       id: prep
       run: |
         REGISTRY_IMAGE=$(echo "ghcr.io/$GITHUB_REPOSITORY" | sed 's/docker-//')
-        VERSION=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ | egrep -m 1 -o 'https?://[^ ]+.tar.gz' | awk -F "/" '{print $NF}' | awk -F '_' '{print $4}')
+        VERSION=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ | egrep -m 1 -io 'https?://[^ ]+.tar.gz' | awk -F "/" '{print $NF}' | awk -F '_' '{print $4}')
         if [[ $GITHUB_REF == refs/tags/v* ]]; then
           VERSION=${GITHUB_REF#refs/tags/}
         fi

Dockerfile

@@ -25,20 +25,26 @@ RUN \
   # Somehow figure out version detection and download URL here
   if [ -z ${OMADA_VERSION+x} ]; then \
     OMADA_VERSION=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ \
-    | egrep -m 1 -o 'https?://[^ ]+.tar.gz' \
+    | egrep -m 1 -io 'https?://[^ ]+.tar.gz' \
     | awk -F "/" '{print $NF}' \
     | awk -F '_' '{print $4}'); \
   fi && \
   mkdir -p /tmp/omada && \
   OMADA_DOWNLOAD=$(curl -sL https://www.tp-link.com/uk/support/download/omada-software-controller/ \
-    | egrep -o "https?://[^ ]+${OMADA_VERSION}_linux_x64.tar.gz") && \
-  # Download Omada package
+    | egrep -io "https?://[^ ]+${OMADA_VERSION}_linux_x64.tar.gz") && \
+  # Download Omada package, try and handle their appalling packaging "standards"
   curl -o \
     /tmp/omada.tar.gz -L \
     ${OMADA_DOWNLOAD} && \
-  tar xf \
-    /tmp/omada.tar.gz -C \
-    /tmp/omada/ --strip-components=1 && \
+  if [ $(tar -tf /tmp/omada.tar.gz | awk -F "\n" '{print $1;exit}' | grep -i "omada") ]; then \
+    tar xf \
+      /tmp/omada.tar.gz -C \
+      /tmp/omada/ --strip-components=1; \
+  else \
+    tar xf \
+      /tmp/omada.tar.gz -C \
+      /tmp/omada/; \
+  fi && \
   mkdir -p /app/omada && \
   cd /tmp/omada && \
   for name in bin data properties webapps keystore lib install.sh uninstall.sh; do cp ${name} /app/omada -r; done && \