Merge pull request #80 from alexadhy/fixes-darwin-image-creation

fixes darwin image creation (SDK extraction)
fyne-io · Oct 7, 2021 · 969af58 · 969af58
2 parents f208c48 + 4d015d7
commit 969af58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/darwin/Dockerfile b/docker/darwin/Dockerfile
@@ -30,10 +30,10 @@ RUN curl -L https://github.com/tpoechtrager/osxcross/archive/${OSX_CROSS_COMMIT}
 RUN ./tools/gen_sdk_package_tools_dmg.sh /tmp/command_line_tools_for_xcode.dmg
 
 ARG SDK_VERSION
-RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.bz2 && \
+RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.* && \
     if [ -z "$SDK_VERSION" ] ;\
-     then ls -1 MacOSX*.tar.bz2 | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
-     else mv MacOSX*.tar.bz2 tarballs ; \
+     then ls -1 MacOSX*.tar.* | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
+     else mv MacOSX*.tar.* tarballs ; \
     fi
 
 RUN UNATTENDED=yes SDK_VERSION=${SDK_VERSION} OSX_VERSION_MIN=${OSX_VERSION_MIN} ./build.sh

diff --git a/internal/resource/darwin_dockerfile.go b/internal/resource/darwin_dockerfile.go
@@ -34,10 +34,10 @@ RUN curl -L https://github.com/tpoechtrager/osxcross/archive/${OSX_CROSS_COMMIT}
 RUN ./tools/gen_sdk_package_tools_dmg.sh /tmp/command_line_tools_for_xcode.dmg
 
 ARG SDK_VERSION
-RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.bz2 && \
+RUN echo "Available SDKs:" && ls -1 MacOSX*.tar.* && \
     if [ -z "$SDK_VERSION" ] ;\
-     then ls -1 MacOSX*.tar.bz2 | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
-     else mv MacOSX*.tar.bz2 tarballs ; \
+     then ls -1 MacOSX*.tar.* | sort -Vr | head -1 | xargs -i mv {} tarballs ;\
+     else mv MacOSX*.tar.* tarballs ; \
     fi
 
 RUN UNATTENDED=yes SDK_VERSION=${SDK_VERSION} OSX_VERSION_MIN=${OSX_VERSION_MIN} ./build.sh