juju-release-tools

Merge lp:~abentley/juju-release-tools/fix-regex into lp:juju-release-tools

  1. fix-regex
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 235
Proposed branch: lp:~abentley/juju-release-tools/fix-regex
Merge into: lp:juju-release-tools
Diff against target: 12 lines (+1/-1)
1 file modified
make-ubuntu-agent.bash (+1/-1)
To merge this branch: bzr merge lp:~abentley/juju-release-tools/fix-regex
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+277170@code.launchpad.net

Commit message

Fix version regex to use instead of hardcoding amd64.

Description of the change

Fix version regex to use $ARCH instead of hardcoding amd64.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'make-ubuntu-agent.bash'
2--- make-ubuntu-agent.bash 2015-11-09 20:07:44 +0000
3+++ make-ubuntu-agent.bash 2015-11-10 19:21:24 +0000
4@@ -6,7 +6,7 @@
5 revision_build=$4
6 RELEASE_TOOLS=$(readlink -f $(dirname $0))
7 jujud=$(find -path ./juju-build-$SERIES-amd64/juju-core-*/bin/jujud -type f)
8-version=$(echo $jujud|sed -r "s/.\/juju-build-$SERIES-amd64\/juju-core-\
9+version=$(echo $jujud|sed -r "s/.\/juju-build-$SERIES-$ARCH\/juju-core-\
10 (.*)\/bin\/jujud/\1/")
11 tarfile=juju-$version-$SERIES-$ARCH.tgz
12 tar -czvf $tarfile -C $(dirname $jujud) jujud

Subscribers

People subscribed via source and target branches