Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
rimusz committed Apr 13, 2015
2 parents ef056f2 + 9d56d8d commit 0fe4174
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/CoreOS k8s Cluster/CoreOS k8s Cluster-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.3.2</string>
<string>0.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>67</string>
<string>69</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
17 changes: 12 additions & 5 deletions src/update.command
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,20 @@ then
~/coreos-k8s-cluster/bin/fleetctl start kube-scheduler.service
fi

if [ "$(diff "$res_folder"/fleet/kubernetes-ui.service ~/coreos-k8s-cluster/fleet/kubernetes-ui.service | tr -d '\n' | cut -c1-4 )" != "" ]
if [ ! -f ~/coreos-k8s-cluster/fleet/kubernetes-ui.service ]
then
echo "updating kubernetes-ui.service!"
cp -fr "$res_folder"/fleet/kubernetes-ui.service ~/coreos-k8s-cluster/fleet/kubernetes-ui.service
~/coreos-k8s-cluster/bin/fleetctl destroy kubernetes-ui.service
~/coreos-k8s-cluster/bin/fleetctl start kubernetes-ui.service
cp -fr "$res_folder"/fleet/kubernetes-ui.service ~/coreos-k8s-cluster/fleet/kubernetes-ui.service
~/coreos-k8s-cluster/bin/fleetctl start kubernetes-ui.service
else
if [ "$(diff "$res_folder"/fleet/kubernetes-ui.service ~/coreos-k8s-cluster/fleet/kubernetes-ui.service | tr -d '\n' | cut -c1-4 )" != "" ]
then
echo "updating kubernetes-ui.service!"
cp -fr "$res_folder"/fleet/kubernetes-ui.service ~/coreos-k8s-cluster/fleet/kubernetes-ui.service
~/coreos-k8s-cluster/bin/fleetctl destroy kubernetes-ui.service
~/coreos-k8s-cluster/bin/fleetctl start kubernetes-ui.service
fi
fi

#
echo "Finished updating fleet units"
~/coreos-k8s-cluster/bin/fleetctl list-units
Expand Down

0 comments on commit 0fe4174

Please sign in to comment.