Fix debsrcbuilder.sh script, and add option in src_tarball script to allow for alternate tmp directory location.

This commit is contained in:
William King 2012-04-19 19:38:46 -07:00
parent 5c2330f766
commit 616004cb7c
2 changed files with 6 additions and 3 deletions

View File

@ -20,6 +20,7 @@ micro=$(echo "$ver" | cut -d. -f3)
rev=$(echo "$ver" | cut -d. -f4) rev=$(echo "$ver" | cut -d. -f4)
build="$2" build="$2"
distro=${3:="unstable"}
dst_version="$major.$minor.$micro" dst_version="$major.$minor.$micro"
dst_name="freeswitch-$dst_version" dst_name="freeswitch-$dst_version"
@ -37,7 +38,7 @@ mv src_dist/$dst_name.tar.bz2 $src_repo/debbuild/freeswitch_${dst_full_version}.
# Build the debian source package first, from the source tar file. # Build the debian source package first, from the source tar file.
cd $src_repo/debbuild/$dst_full_name cd $src_repo/debbuild/$dst_full_name
dch -v $dst_full_version-1 "Nightly Build" dch -v "${dst_full_version}-0" -M --force-distribution -D "$distro" "Nightly Build"
dpkg-buildpackage -rfakeroot -S -us -uc dpkg-buildpackage -rfakeroot -S -us -uc

View File

@ -19,11 +19,13 @@ minor=$(echo "$ver" | cut -d. -f2)
micro=$(echo "$ver" | cut -d. -f3) micro=$(echo "$ver" | cut -d. -f3)
rev=$(echo "$ver" | cut -d. -f4) rev=$(echo "$ver" | cut -d. -f4)
tmp_dir=${TMP_DIR:="/tmp"}
build="$2" build="$2"
dst_name="freeswitch-$major.$minor.$micro" dst_name="freeswitch-$major.$minor.$micro"
dst_parent="/tmp/jenkis.$$/" dst_parent="${tmp_dir}/jenkis.$$/"
dst_dir="/tmp/jenkins.$$/$dst_name" dst_dir="${tmp_dir}/jenkins.$$/$dst_name"
if [ -d "$dst_dir" ]; then if [ -d "$dst_dir" ]; then
echo "error: destination directory $dst_dir already exists." 1>&2 echo "error: destination directory $dst_dir already exists." 1>&2