commit 292058c721a7370da6fb54094bf784b37d5d5599 Author: Damian Johnson <atagar@torproject.org> Date: Fri Apr 22 09:05:03 2011 -0700 Making deb-prep take the arm version as an arg --- build/debian/README.source | 2 +- deb-prep.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source index 8f3bbdd..078cc52 100644 --- a/build/debian/README.source +++ b/build/debian/README.source @@ -4,7 +4,7 @@ git clone git://git.torproject.org/arm.git cd arm git checkout -b release remotes/origin/release git checkout -b packaging remotes/origin/packaging -./deb-prep-sh +./deb-prep-sh <arm version> cd release_deb ./debian/make-deb diff --git a/deb-prep.sh b/deb-prep.sh index 6962143..f054064 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -14,7 +14,12 @@ # alternate (works, but not sure if it'll miss resources like gitignore): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -export DEB_VERSION="1.4.2.4" +if [ $# -lt 1 ] + then + echo "Usage: ./deb-prep.sh <arm version>" + exit 1 + else debVersion=$1 +fi mkdir release_deb git archive --format=tar release | (cd ./release_deb && tar xf -) @@ -24,7 +29,7 @@ git archive --format=tar release | (cd ./release_deb && tar xf -) # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1 -tar czf tor-arm_${DEB_VERSION}.orig.tar.gz release_deb +tar czf tor-arm_${debVersion}.orig.tar.gz release_deb (cd build && git archive --format=tar packaging debian) | (cd ./release_deb && tar xf -)