summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-29 20:42:07 +0100
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-29 20:42:07 +0100
commit1c30298885f581f3bf3731576374da7044973747 (patch)
tree9fc6fff312d7738f534be635b7d55f3af1c3a5e3
parentb0e7b12ed43b6614b6c32f1678edf53f1c668513 (diff)
downloaddbscripts-1c30298885f581f3bf3731576374da7044973747.tar.gz
dbscripts-1c30298885f581f3bf3731576374da7044973747.tar.xz
Fix sourceball generation to work with conf file
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmisc-scripts/make-sourceball9
1 files changed, 3 insertions, 6 deletions
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index 0006092..7a02abf 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -13,10 +13,7 @@ packagename="$1"
reponame="$2"
arch="$3"
-##### Arch specific stuff. TODO make this configurable #####
-srcpath="/srv/ftp/sources/"
-svnpath="file:///srv/svn-packages/$packagename/"
-############################################################
+srcpath="$FTP_BASE/sources/"
WORKDIR="/tmp/make-sourceball.$packagename.$UID"
@@ -73,7 +70,7 @@ cd "$WORKDIR"
echo "Creating Source tarball for $packagename ($reponame-$arch)"
-if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then
+if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then
create_srcpackage "$packagename"
if [ $? -eq 0 ]; then
exit 0
@@ -81,7 +78,7 @@ if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then
#trunk sometimes has updated URLs
echo ":: Failed to download source, attempting trunk build"
rm -rf "$packagename"
- if /usr/bin/svn export -q "$svnpath/trunk" "$packagename"; then
+ if /usr/bin/svn export -q "$SVN_PATH/trunk" "$packagename"; then
create_srcpackage "$packagename"
if [ $? -eq 0 ]; then
echo ":: Source package complete: $pkg_file"