~nskaggs/juju-ci-tools/ci-jimm

« back to all changes in this revision

Viewing changes to streams-from-local.bash

  • Committer: Curtis Hovey
  • Date: 2017-01-03 21:57:52 UTC
  • Revision ID: curtis@canonical.com-20170103215752-yksodnuefbffepb3
 Fix version and arch detection in juju agent. [restored commit]

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
fi
23
23
 
24
24
full_version=$($JUJUD version)
25
 
version=$(echo $full_version | cut -d '-' -f 1)
26
 
arch=$(echo $full_version | cut -d '-' -f 3)
 
25
version=$(echo $full_version | sed -r 's,(.*)-[^-]+-[^-]+,\1,')
 
26
arch=$(echo $full_version | sed -r 's,.*-([^-]+),\1,')
27
27
 
28
28
# Juju wont permit devel versions to be in released streams.
29
29
if [[ $version =~ (alpha|beta) ]]; then