Skip to content

Commit

Permalink
Merge pull request #100 from TheNewNormal/v1.5.4
Browse files Browse the repository at this point in the history
v1.5.4
  • Loading branch information
rimusz authored Nov 14, 2016
2 parents be1f860 + 9f5f20a commit 4aaae03
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
Binary file not shown.
4 changes: 2 additions & 2 deletions src/CoreOS/CoreOS-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 16 additions & 2 deletions src/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4aaae03

Please sign in to comment.