From d29efb71caaf6c2229f1e4d261491a7abed518cc Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 26 May 2020 10:48:08 -0400
Subject: [PATCH] switch to jq due to inconsistent github formatting

---
 .travis.yml |  6 +++++-
 Dockerfile  | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a7a3fb..abf6fea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ env:
     - BASEIMAGE="code-server"
     - MODNAME="powershell"
 
+before_install:
+  - sudo apt-get update
+  - sudo apt-get -y install jq
+
 jobs:
   include:
     - stage: PR-BuildImage
@@ -26,7 +30,7 @@ jobs:
       if: (NOT (type IN (pull_request)))
       script:
         # Set version
-        - PS_VERSION=$(curl -sX GET "https://api.github.com/repos/PowerShell/PowerShell/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }')
+        - PS_VERSION=$(curl -sX GET "https://api.github.com/repos/PowerShell/PowerShell/releases/latest" | jq -r .tag_name | awk '{print substr($1,2); }')
         # Build image
         - docker build --no-cache --build-arg PS_VERSION=${PS_VERSION} -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${PS_VERSION}-${TRAVIS_COMMIT} .
         - docker tag ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${PS_VERSION}-${TRAVIS_COMMIT} ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
diff --git a/Dockerfile b/Dockerfile
index 1e5a328..c30944e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,21 +4,27 @@ ARG PS_VERSION
 
 RUN \
  apk add --no-cache \
-    curl && \
+    curl \
+    jq && \
  if [ -z ${PS_VERSION+x} ]; then \
 	PS_VERSION=$(curl -sX GET "https://api.github.com/repos/PowerShell/PowerShell/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }'); \
+	| jq -r .tag_name | awk '{print substr($1,2); }'); \
  fi && \
  mkdir -p /root-layer/powershell && \
  curl -o \
-   /root-layer/powershell/powershell_x86_64.tar.gz -L \
-   "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-x64.tar.gz" && \
+    /root-layer/powershell/powershell_x86_64.tar.gz -L \
+    "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-x64.tar.gz" && \
  curl -o \
-   /root-layer/powershell/powershell_armv7l.tar.gz -L \
-   "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm32.tar.gz" && \
+    /root-layer/powershell/powershell_armv7l.tar.gz -L \
+    "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm32.tar.gz" && \
  curl -o \
-   /root-layer/powershell/powershell_aarch64.tar.gz -L \
-   "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm64.tar.gz"
+    /root-layer/powershell/powershell_aarch64.tar.gz -L \
+    "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm64.tar.gz" && \
+ echo "******** run basic test to validate tarballs *********" && \
+ for i in x86_64 armv7l aarch64; do \
+    mkdir -p "/tmp/${i}"; \
+    tar xzf "/root-layer/powershell/powershell_${i}.tar.gz" -C "/tmp/${i}"; \
+ done
 
 COPY root/ /root-layer/