Merge pull request #100 from TheNewNormal/v1.5.4

v1.5.4
TheNewNormal · Nov 14, 2016 · 4aaae03 · 4aaae03
2 parents be1f860 + 9f5f20a
commit 4aaae03
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/CoreOS/CoreOS-Info.plist b/src/CoreOS/CoreOS-Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.3</string>
+	<string>1.5.4</string>
 	<key>CFBundleVersion</key>
-	<string>541</string>
+	<string>544</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/functions.sh b/src/functions.sh
@@ -174,8 +174,15 @@ DOCKER_VERSION=$(~/bin/corectl ssh core-01 'docker version' | grep 'Version:' |
 # check if the binary exists
 if [ ! -f ~/coreos-osx/bin/docker ]; then
     cd ~/coreos-osx/bin
+    echo " "
     echo "Downloading docker $DOCKER_VERSION client for macOS"
-    curl -o ~/coreos-osx/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
+    curl -o ~/coreos-osx/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
+    # tarball with directory docker containing docker executable
+    tar -xzf docker.tgz
+    mv docker dockerdir
+    mv dockerdir/docker .
+    rm docker.tgz
+    rmdir -p dockerdir
     # Make it executable
     chmod +x ~/coreos-osx/bin/docker
     osx_clients_upgrade=1
@@ -186,8 +193,15 @@ else
     if [ $MATCH -eq 0 ]; then
         # the version is different
         cd ~/coreos-osx/bin
+        echo " "
         echo "Downloading docker $DOCKER_VERSION client for macOS"
-        curl -o ~/coreos-osx/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
+        curl -o ~/coreos-osx/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
+        # tarball with directory docker containing docker executable
+        tar -xzf docker.tgz
+        mv docker dockerdir
+        mv dockerdir/docker .
+        rm docker.tgz
+        rmdir -p dockerdir
         # Make it executable
         chmod +x ~/coreos-osx/bin/docker
         osx_clients_upgrade=1